Commit 86321d37 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

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

parent f8d45d6a
......@@ -50,7 +50,7 @@ class AttachmentEditDialog : public QDialog
public:
AttachmentEditDialog(AttachmentIconItem *item, QWidget *parent, bool modal = true);
virtual ~AttachmentEditDialog();
void accept() Q_DECL_OVERRIDE;
void accept() override;
protected Q_SLOTS:
void inlineChanged(int state);
......
......@@ -51,9 +51,9 @@ public:
QUrl tempFileForAttachment(const KCalCore::Attachment::Ptr &attachment) const;
protected:
QMimeData *mimeData(const QList<QListWidgetItem *> items) const Q_DECL_OVERRIDE;
void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
QMimeData *mimeData(const QList<QListWidgetItem *> items) const override;
void startDrag(Qt::DropActions supportedActions) override;
void keyPressEvent(QKeyEvent *event) override;
private:
mutable QHash<KCalCore::Attachment::Ptr, QUrl> mTempFiles;
......
......@@ -42,13 +42,13 @@ class AttendeeComboBoxDelegate : public QStyledItemDelegate
public:
explicit AttendeeComboBoxDelegate(QObject *parent = nullptr);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE;
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
bool eventFilter(QObject *editor, QEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *editor, QEvent *event) override;
virtual void addItem(const QIcon &, const QString &);
virtual void clear();
......@@ -61,7 +61,7 @@ public:
void setStandardIndex(int);
public Q_SLOTS:
bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE;
bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index) override;
private Q_SLOTS:
void doCloseEditor(QWidget *editor);
......
......@@ -42,8 +42,8 @@ public:
explicit AttendeeData(const KCalCore::Attendee::Ptr &attendee) : KCalCore::Attendee(*attendee) {}
void clear() Q_DECL_OVERRIDE;
bool isEmpty() const Q_DECL_OVERRIDE;
void clear() override;
bool isEmpty() const override;
/**
* Return a copy of the attendee data
......
......@@ -37,7 +37,7 @@ public:
{
}
KPIM::MultiplyingLine *newLine(QWidget *parent) Q_DECL_OVERRIDE {
KPIM::MultiplyingLine *newLine(QWidget *parent) override {
return new AttendeeLine(parent);
}
};
......
......@@ -58,7 +58,7 @@ public Q_SLOTS:
void setCurrentIndex(int index);
protected:
void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent *ev) override;
private:
void slotActionTriggered();
......@@ -81,7 +81,7 @@ Q_SIGNALS:
void downPressed();
protected:
void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent *ev) override;
};
class AttendeeLine : public KPIM::MultiplyingLine
......@@ -96,27 +96,27 @@ public:
explicit AttendeeLine(QWidget *parent);
virtual ~AttendeeLine() {}
void activate() Q_DECL_OVERRIDE;
bool isActive() const Q_DECL_OVERRIDE;
void activate() override;
bool isActive() const override;
bool isEmpty() const Q_DECL_OVERRIDE;
void clear() Q_DECL_OVERRIDE;
bool isEmpty() const override;
void clear() override;
bool isModified() const Q_DECL_OVERRIDE;
void clearModified() Q_DECL_OVERRIDE;
bool isModified() const override;
void clearModified() override;
KPIM::MultiplyingLineData::Ptr data() const Q_DECL_OVERRIDE;
void setData(const KPIM::MultiplyingLineData::Ptr &data) Q_DECL_OVERRIDE;
KPIM::MultiplyingLineData::Ptr data() const override;
void setData(const KPIM::MultiplyingLineData::Ptr &data) override;
void fixTabOrder(QWidget *previous) Q_DECL_OVERRIDE;
QWidget *tabOut() const Q_DECL_OVERRIDE;
void fixTabOrder(QWidget *previous) override;
QWidget *tabOut() const override;
void setCompletionMode(KCompletion::CompletionMode) Q_DECL_OVERRIDE;
void setCompletionMode(KCompletion::CompletionMode) override;
int setColumnWidth(int w) Q_DECL_OVERRIDE;
int setColumnWidth(int w) override;
void aboutToBeDeleted() Q_DECL_OVERRIDE;
bool canDeleteLineEdit() const Q_DECL_OVERRIDE;
void aboutToBeDeleted() override;
bool canDeleteLineEdit() const override;
void setActions(AttendeeActions actions);
......
......@@ -39,15 +39,15 @@ class AttendeeLineEditDelegate : public QStyledItemDelegate
public:
explicit AttendeeLineEditDelegate(QObject *parent = nullptr);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE;
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setEditorData(QWidget *editor, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
virtual void setCompletionMode(KCompletion::CompletionMode mode);
public Q_SLOTS:
bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE;
bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index) override;
private:
void rightPressed();
......
......@@ -59,18 +59,18 @@ public:
explicit AttendeeTableModel(const KCalCore::Attendee::List &resources, QObject *parent = nullptr);
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
int role = Qt::DisplayRole) const override;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value,
int role = Qt::EditRole) Q_DECL_OVERRIDE;
int role = Qt::EditRole) override;
bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex()) Q_DECL_OVERRIDE;
bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex()) Q_DECL_OVERRIDE;
bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex()) override;
bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex()) override;
bool insertAttendee(int position, const KCalCore::Attendee::Ptr &attendee);
......@@ -96,7 +96,7 @@ class ResourceFilterProxyModel : public QSortFilterProxyModel
Q_OBJECT
public:
explicit ResourceFilterProxyModel(QObject *parent = nullptr);
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE;
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
};
class AttendeeFilterProxyModel : public QSortFilterProxyModel
......@@ -104,7 +104,7 @@ class AttendeeFilterProxyModel : public QSortFilterProxyModel
Q_OBJECT
public:
explicit AttendeeFilterProxyModel(QObject *parent = nullptr);
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE;
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
};
}
......
......@@ -51,18 +51,18 @@ public:
* Returns whether or not the current values in the editor differ from the
* initial values or if one of the combined editors is dirty.
*/
bool isDirty() const Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
bool isDirty() const override;
bool isValid() const override;
/**
* Loads all data from @param inicidence into the combined editors. Note, if
* you reimplement the load method in a subclass, make sure to call this
* implementation too.
*/
void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void load(const Akonadi::Item &item) Q_DECL_OVERRIDE;
void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void save(Akonadi::Item &item) Q_DECL_OVERRIDE;
void load(const KCalCore::Incidence::Ptr &incidence) override;
void load(const Akonadi::Item &item) override;
void save(const KCalCore::Incidence::Ptr &incidence) override;
void save(Akonadi::Item &item) override;
Q_SIGNALS:
void showMessage(const QString &reason, KMessageWidget::MessageType) const;
......
......@@ -50,7 +50,7 @@ class INCIDENCEEDITOR_EXPORT FreeBusyGanttProxyModel : public QSortFilterProxyMo
Q_OBJECT
public:
explicit FreeBusyGanttProxyModel(QObject *parent = nullptr);
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QString tooltipify(const KCalCore::FreeBusyPeriod &period,
const KDateTime::Spec &timeSpec) const;
};
......
......@@ -28,9 +28,9 @@ class INCIDENCEEDITOR_EXPORT GroupwareUiDelegate : public Akonadi::GroupwareUiDe
{
public:
void requestIncidenceEditor(const Akonadi::Item &item) Q_DECL_OVERRIDE;
void setCalendar(const Akonadi::ETMCalendar::Ptr &calendar) Q_DECL_OVERRIDE;
void createCalendar() Q_DECL_OVERRIDE;
void requestIncidenceEditor(const Akonadi::Item &item) override;
void setCalendar(const Akonadi::ETMCalendar::Ptr &calendar) override;
void createCalendar() override;
};
}
......@@ -41,9 +41,9 @@ public:
using IncidenceEditorNG::IncidenceEditor::save; // So we don't trigger -Woverloaded-virtual
IncidenceAlarm(IncidenceDateTime *dateTime, Ui::EventOrTodoDesktop *ui);
void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
bool isDirty() const Q_DECL_OVERRIDE;
void load(const KCalCore::Incidence::Ptr &incidence) override;
void save(const KCalCore::Incidence::Ptr &incidence) override;
bool isDirty() const override;
Q_SIGNALS:
void alarmCountChanged(int newCount);
......
......@@ -50,9 +50,9 @@ public:
~IncidenceAttachment();
void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
bool isDirty() const Q_DECL_OVERRIDE;
void load(const KCalCore::Incidence::Ptr &incidence) override;
void save(const KCalCore::Incidence::Ptr &incidence) override;
bool isDirty() const override;
int attachmentCount() const;
......
......@@ -56,10 +56,10 @@ public:
IncidenceAttendee(QWidget *parent, IncidenceDateTime *dateTime, Ui::EventOrTodoDesktop *ui);
~IncidenceAttendee();
void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
bool isDirty() const Q_DECL_OVERRIDE;
void printDebugInfo() const Q_DECL_OVERRIDE;
void load(const KCalCore::Incidence::Ptr &incidence) override;
void save(const KCalCore::Incidence::Ptr &incidence) override;
bool isDirty() const override;
void printDebugInfo() const override;
AttendeeTableModel *dataModel() const;
AttendeeComboBoxDelegate *stateDelegate() const;
......
......@@ -37,18 +37,18 @@ class IncidenceCategories : public IncidenceEditor
public:
explicit IncidenceCategories(Ui::EventOrTodoDesktop *ui);
void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void load(const Akonadi::Item &item) Q_DECL_OVERRIDE;
void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void save(Akonadi::Item &item) Q_DECL_OVERRIDE;
void load(const KCalCore::Incidence::Ptr &incidence) override;
void load(const Akonadi::Item &item) override;
void save(const KCalCore::Incidence::Ptr &incidence) override;
void save(Akonadi::Item &item) override;
/**
* Returns the list of currently selected categories.
*/
QStringList categories() const;
bool isDirty() const Q_DECL_OVERRIDE;
void printDebugInfo() const Q_DECL_OVERRIDE;
bool isDirty() const override;
void printDebugInfo() const override;
private:
void matchExistingCategories(const QStringList &categories, const Akonadi::Tag::List &existingTags);
......
......@@ -41,9 +41,9 @@ public:
explicit IncidenceCompletionPriority(Ui::EventOrTodoDesktop *ui);
~IncidenceCompletionPriority();
void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
bool isDirty() const Q_DECL_OVERRIDE;
void load(const KCalCore::Incidence::Ptr &incidence) override;
void save(const KCalCore::Incidence::Ptr &incidence) override;
bool isDirty() const override;
private:
class Private;
......
......@@ -51,9 +51,9 @@ public:
explicit IncidenceDateTime(Ui::EventOrTodoDesktop *ui);
~IncidenceDateTime();
void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
bool isDirty() const Q_DECL_OVERRIDE;
void load(const KCalCore::Incidence::Ptr &incidence) override;
void save(const KCalCore::Incidence::Ptr &incidence) override;
bool isDirty() const override;
/**
* Sets the active date for the editing session. This defaults to the current
......@@ -77,8 +77,8 @@ public:
bool startDateTimeEnabled() const;
bool endDateTimeEnabled() const;
bool isValid() const Q_DECL_OVERRIDE;
void printDebugInfo() const Q_DECL_OVERRIDE;
bool isValid() const override;
void printDebugInfo() const override;
Q_SIGNALS:
// used to indicate that the widgets were activated
......@@ -115,7 +115,7 @@ private Q_SLOTS: /// Event specific
bool isDirty(const KCalCore::Journal::Ptr &journal) const;
protected:
bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE;
bool eventFilter(QObject *obj, QEvent *event) override;
private:
void load(const KCalCore::Event::Ptr &event, bool isTemplate = false, bool templateOverridesTimes = false);
......
......@@ -48,14 +48,14 @@ public:
~IncidenceDescription();
void load(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
bool isDirty() const Q_DECL_OVERRIDE;
void load(const KCalCore::Incidence::Ptr &incidence) override;
void save(const KCalCore::Incidence::Ptr &incidence) override;
bool isDirty() const override;
// For debugging pursposes
bool richTextEnabled() const;
void printDebugInfo() const Q_DECL_OVERRIDE;
void printDebugInfo() const override;
private:
void toggleRichTextDescription();
......
......@@ -112,17 +112,17 @@ public:
void slotInvalidCollection();
/// ItemEditorUi methods
bool containsPayloadIdentifiers(const QSet<QByteArray> &partIdentifiers) const Q_DECL_OVERRIDE;
bool containsPayloadIdentifiers(const QSet<QByteArray> &partIdentifiers) const override;
void handleItemSaveFinish(EditorItemManager::SaveAction);
void handleItemSaveFail(EditorItemManager::SaveAction, const QString &errorMessage);
bool hasSupportedPayload(const Akonadi::Item &item) const Q_DECL_OVERRIDE;
bool isDirty() const Q_DECL_OVERRIDE;
bool isValid() const Q_DECL_OVERRIDE;
void load(const Akonadi::Item &item) Q_DECL_OVERRIDE;
Akonadi::Item save(const Akonadi::Item &item) Q_DECL_OVERRIDE;
Akonadi::Collection selectedCollection() const Q_DECL_OVERRIDE;
void reject(RejectReason reason, const QString &errorMessage = QString()) Q_DECL_OVERRIDE;
bool hasSupportedPayload(const Akonadi::Item &item) const override;
bool isDirty() const override;
bool isValid() const override;
void load(const Akonadi::Item &item) override;
Akonadi::Item save(const Akonadi::Item &item) override;
Akonadi::Collection selectedCollection() const override;
void reject(RejectReason reason, const QString &errorMessage = QString()) override;
};
}
......
......@@ -93,7 +93,7 @@ Q_SIGNALS:
void incidenceCreated(const Akonadi::Item &);
void invalidCollection() const;
protected:
void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
void closeEvent(QCloseEvent *event) override;
protected Q_SLOTS:
void slotButtonClicked(QAbstractButton *button);
......
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