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

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

parent ecf52a4e
...@@ -110,8 +110,8 @@ class AkonadiModel : public Akonadi::EntityTreeModel ...@@ -110,8 +110,8 @@ class AkonadiModel : public Akonadi::EntityTreeModel
*/ */
void updateCommandError(const KAEvent&); void updateCommandError(const KAEvent&);
QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex&, const QVariant& value, int role) Q_DECL_OVERRIDE; bool setData(const QModelIndex&, const QVariant& value, int role) override;
/** Refresh the specified collection instance with up to date data. */ /** Refresh the specified collection instance with up to date data. */
bool refresh(Akonadi::Collection&) const; bool refresh(Akonadi::Collection&) const;
...@@ -250,8 +250,8 @@ class AkonadiModel : public Akonadi::EntityTreeModel ...@@ -250,8 +250,8 @@ class AkonadiModel : public Akonadi::EntityTreeModel
void serverStopped(); void serverStopped();
protected: protected:
QVariant entityHeaderData(int section, Qt::Orientation, int role, HeaderGroup) const Q_DECL_OVERRIDE; QVariant entityHeaderData(int section, Qt::Orientation, int role, HeaderGroup) const override;
int entityColumnCount(HeaderGroup) const Q_DECL_OVERRIDE; int entityColumnCount(HeaderGroup) const override;
private Q_SLOTS: private Q_SLOTS:
void checkResources(Akonadi::ServerManager::State); void checkResources(Akonadi::ServerManager::State);
......
...@@ -32,9 +32,9 @@ class AlarmListDelegate : public EventListDelegate ...@@ -32,9 +32,9 @@ class AlarmListDelegate : public EventListDelegate
public: public:
explicit AlarmListDelegate(AlarmListView* parent = nullptr) explicit AlarmListDelegate(AlarmListView* parent = nullptr)
: EventListDelegate(parent) {} : EventListDelegate(parent) {}
void paint(QPainter*, const QStyleOptionViewItem&, const QModelIndex&) const Q_DECL_OVERRIDE; void paint(QPainter*, const QStyleOptionViewItem&, const QModelIndex&) const override;
QSize sizeHint(const QStyleOptionViewItem&, const QModelIndex&) const Q_DECL_OVERRIDE; QSize sizeHint(const QStyleOptionViewItem&, const QModelIndex&) const override;
void edit(KAEvent*, EventListView*) Q_DECL_OVERRIDE; void edit(KAEvent*, EventListView*) override;
}; };
#endif #endif
......
...@@ -33,7 +33,7 @@ class AlarmListView : public EventListView ...@@ -33,7 +33,7 @@ class AlarmListView : public EventListView
Q_OBJECT Q_OBJECT
public: public:
explicit AlarmListView(const QByteArray& configGroup, QWidget* parent = nullptr); explicit AlarmListView(const QByteArray& configGroup, QWidget* parent = nullptr);
void setModel(QAbstractItemModel*) Q_DECL_OVERRIDE; void setModel(QAbstractItemModel*) override;
void selectTimeColumns(bool time, bool timeTo); void selectTimeColumns(bool time, bool timeTo);
private Q_SLOTS: private Q_SLOTS:
......
...@@ -60,7 +60,7 @@ class AlarmTimeWidget : public QFrame ...@@ -60,7 +60,7 @@ class AlarmTimeWidget : public QFrame
void enableAnyTime(bool enable); void enableAnyTime(bool enable);
void selectTimeFromNow(int minutes = 0); void selectTimeFromNow(int minutes = 0);
void showMoreOptions(bool); void showMoreOptions(bool);
QSize sizeHint() const Q_DECL_OVERRIDE { return minimumSizeHint(); } QSize sizeHint() const override { return minimumSizeHint(); }
static QString i18n_TimeAfterPeriod(); static QString i18n_TimeAfterPeriod();
static const int maxDelayTime; // maximum time from now static const int maxDelayTime; // maximum time from now
......
...@@ -87,7 +87,7 @@ class BLineEdit : public QLineEdit ...@@ -87,7 +87,7 @@ class BLineEdit : public QLineEdit
void focusLost(); void focusLost();
protected: protected:
void focusOutEvent(QFocusEvent*) Q_DECL_OVERRIDE { Q_EMIT focusLost(); } void focusOutEvent(QFocusEvent*) override { Q_EMIT focusLost(); }
}; };
#endif // BIRTHDAYDLG_H #endif // BIRTHDAYDLG_H
......
...@@ -55,8 +55,8 @@ class BirthdayModel : public Akonadi::ContactsTreeModel ...@@ -55,8 +55,8 @@ class BirthdayModel : public Akonadi::ContactsTreeModel
*/ */
static BirthdayModel* instance(); static BirthdayModel* instance();
QVariant entityData(const Akonadi::Item&, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant entityData(const Akonadi::Item&, int column, int role = Qt::DisplayRole) const override;
QVariant entityData(const Akonadi::Collection& collection, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE QVariant entityData(const Akonadi::Collection& collection, int column, int role = Qt::DisplayRole) const override
{ return Akonadi::ContactsTreeModel::entityData(collection, column, role); } { return Akonadi::ContactsTreeModel::entityData(collection, column, role); }
private: private:
...@@ -75,7 +75,7 @@ class BirthdaySortModel : public QSortFilterProxyModel ...@@ -75,7 +75,7 @@ class BirthdaySortModel : public QSortFilterProxyModel
void setPrefixSuffix(const QString& prefix, const QString& suffix); void setPrefixSuffix(const QString& prefix, const QString& suffix);
protected: protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const Q_DECL_OVERRIDE; bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
private: private:
QStringList mContactsWithAlarm; QStringList mContactsWithAlarm;
......
...@@ -69,7 +69,7 @@ class CollectionMimeTypeFilterModel : public Akonadi::EntityMimeTypeFilterModel ...@@ -69,7 +69,7 @@ class CollectionMimeTypeFilterModel : public Akonadi::EntityMimeTypeFilterModel
QModelIndex collectionIndex(const Akonadi::Collection&) const; QModelIndex collectionIndex(const Akonadi::Collection&) const;
protected: protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const Q_DECL_OVERRIDE; bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
private: private:
CalEvent::Type mAlarmType; // collection content type contained in this model CalEvent::Type mAlarmType; // collection content type contained in this model
......
...@@ -59,7 +59,7 @@ class CollectionListModel : public KDescendantsProxyModel ...@@ -59,7 +59,7 @@ class CollectionListModel : public KDescendantsProxyModel
Akonadi::Collection collection(const QModelIndex&) const; Akonadi::Collection collection(const QModelIndex&) const;
QModelIndex collectionIndex(const Akonadi::Collection&) const; QModelIndex collectionIndex(const Akonadi::Collection&) const;
virtual bool isDescendantOf(const QModelIndex& ancestor, const QModelIndex& descendant) const; virtual bool isDescendantOf(const QModelIndex& ancestor, const QModelIndex& descendant) const;
QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const override;
private: private:
bool mUseCollectionColour; bool mUseCollectionColour;
...@@ -82,8 +82,8 @@ class CollectionCheckListModel : public KCheckableProxyModel ...@@ -82,8 +82,8 @@ class CollectionCheckListModel : public KCheckableProxyModel
~CollectionCheckListModel(); ~CollectionCheckListModel();
Akonadi::Collection collection(int row) const; Akonadi::Collection collection(int row) const;
Akonadi::Collection collection(const QModelIndex&) const; Akonadi::Collection collection(const QModelIndex&) const;
QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex&, const QVariant& value, int role) Q_DECL_OVERRIDE; bool setData(const QModelIndex&, const QVariant& value, int role) override;
Q_SIGNALS: Q_SIGNALS:
void collectionTypeChange(CollectionCheckListModel*); void collectionTypeChange(CollectionCheckListModel*);
...@@ -117,10 +117,10 @@ class CollectionFilterCheckListModel : public QSortFilterProxyModel ...@@ -117,10 +117,10 @@ class CollectionFilterCheckListModel : public QSortFilterProxyModel
void setEventTypeFilter(CalEvent::Type); void setEventTypeFilter(CalEvent::Type);
Akonadi::Collection collection(int row) const; Akonadi::Collection collection(int row) const;
Akonadi::Collection collection(const QModelIndex&) const; Akonadi::Collection collection(const QModelIndex&) const;
QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const override;
protected: protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const Q_DECL_OVERRIDE; bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
private Q_SLOTS: private Q_SLOTS:
void collectionTypeChanged(CollectionCheckListModel*); void collectionTypeChanged(CollectionCheckListModel*);
...@@ -147,9 +147,9 @@ class CollectionView : public QListView ...@@ -147,9 +147,9 @@ class CollectionView : public QListView
Akonadi::Collection collection(const QModelIndex&) const; Akonadi::Collection collection(const QModelIndex&) const;
protected: protected:
void setModel(QAbstractItemModel*) Q_DECL_OVERRIDE; void setModel(QAbstractItemModel*) override;
void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; void mouseReleaseEvent(QMouseEvent*) override;
bool viewportEvent(QEvent*) Q_DECL_OVERRIDE; bool viewportEvent(QEvent*) override;
}; };
...@@ -277,7 +277,7 @@ class CollectionControlModel : public Akonadi::FavoriteCollectionsModel ...@@ -277,7 +277,7 @@ class CollectionControlModel : public Akonadi::FavoriteCollectionsModel
*/ */
bool waitUntilPopulated(Akonadi::Collection::Id colId = -1, int timeout = 0); bool waitUntilPopulated(Akonadi::Collection::Id colId = -1, int timeout = 0);
QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const override;
/** Return a bulleted list of alarm types for inclusion in an i18n message. */ /** Return a bulleted list of alarm types for inclusion in an i18n message. */
static QString typeListForDisplay(CalEvent::Types); static QString typeListForDisplay(CalEvent::Types);
......
...@@ -82,7 +82,7 @@ class EditAlarmDlg : public QDialog ...@@ -82,7 +82,7 @@ class EditAlarmDlg : public QDialog
void setLateCancel(int minutes); void setLateCancel(int minutes);
void setShowInKOrganizer(bool); void setShowInKOrganizer(bool);
QSize sizeHint() const Q_DECL_OVERRIDE { return minimumSizeHint(); } QSize sizeHint() const override { return minimumSizeHint(); }
static int instanceCount(); static int instanceCount();
static QString i18n_chk_ShowInKOrganizer(); // text of 'Show in KOrganizer' checkbox static QString i18n_chk_ShowInKOrganizer(); // text of 'Show in KOrganizer' checkbox
...@@ -93,10 +93,10 @@ class EditAlarmDlg : public QDialog ...@@ -93,10 +93,10 @@ class EditAlarmDlg : public QDialog
EditAlarmDlg(bool Template, const KAEvent*, bool newAlarm, QWidget* parent = nullptr, EditAlarmDlg(bool Template, const KAEvent*, bool newAlarm, QWidget* parent = nullptr,
GetResourceType = RES_PROMPT, bool readOnly = false); GetResourceType = RES_PROMPT, bool readOnly = false);
void init(const KAEvent* event); void init(const KAEvent* event);
void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE; void resizeEvent(QResizeEvent*) override;
void showEvent(QShowEvent*) Q_DECL_OVERRIDE; void showEvent(QShowEvent*) override;
void closeEvent(QCloseEvent*) Q_DECL_OVERRIDE; void closeEvent(QCloseEvent*) override;
bool eventFilter(QObject*, QEvent*) Q_DECL_OVERRIDE; bool eventFilter(QObject*, QEvent*) override;
virtual QString type_caption() const = 0; virtual QString type_caption() const = 0;
virtual void type_init(QWidget* parent, QVBoxLayout* frameLayout) = 0; virtual void type_init(QWidget* parent, QVBoxLayout* frameLayout) = 0;
virtual void type_initValues(const KAEvent*) = 0; virtual void type_initValues(const KAEvent*) = 0;
......
...@@ -82,7 +82,7 @@ class PickLogFileRadio : public PickFileRadio ...@@ -82,7 +82,7 @@ class PickLogFileRadio : public PickFileRadio
public: public:
PickLogFileRadio(QPushButton* b, LineEdit* e, const QString& text, ButtonGroup* group, QWidget* parent) PickLogFileRadio(QPushButton* b, LineEdit* e, const QString& text, ButtonGroup* group, QWidget* parent)
: PickFileRadio(b, e, text, group, parent) { } : PickFileRadio(b, e, text, group, parent) { }
QString pickFile() Q_DECL_OVERRIDE // called when browse button is pressed to select a log file QString pickFile() override // called when browse button is pressed to select a log file
{ {
return KAlarm::browseFile(i18nc("@title:window", "Choose Log File"), mDefaultDir, fileEdit()->text(), QString(), return KAlarm::browseFile(i18nc("@title:window", "Choose Log File"), mDefaultDir, fileEdit()->text(), QString(),
KFile::LocalOnly, parentWidget()); KFile::LocalOnly, parentWidget());
......
...@@ -58,7 +58,7 @@ class EditDisplayAlarmDlg : public EditAlarmDlg ...@@ -58,7 +58,7 @@ class EditDisplayAlarmDlg : public EditAlarmDlg
// Methods to initialise values in the New Alarm dialogue. // Methods to initialise values in the New Alarm dialogue.
// N.B. setTime() must be called first to set the date-only characteristic, // N.B. setTime() must be called first to set the date-only characteristic,
// followed by setRecurrence(). // followed by setRecurrence().
void setAction(KAEvent::SubAction, const AlarmText& = AlarmText()) Q_DECL_OVERRIDE; void setAction(KAEvent::SubAction, const AlarmText& = AlarmText()) override;
void setBgColour(const QColor&); void setBgColour(const QColor&);
void setFgColour(const QColor&); void setFgColour(const QColor&);
void setConfirmAck(bool); void setConfirmAck(bool);
...@@ -66,24 +66,24 @@ class EditDisplayAlarmDlg : public EditAlarmDlg ...@@ -66,24 +66,24 @@ class EditDisplayAlarmDlg : public EditAlarmDlg
void setAudio(Preferences::SoundType, const QString& file = QString(), float volume = -1, int repeatPause = -1); void setAudio(Preferences::SoundType, const QString& file = QString(), float volume = -1, int repeatPause = -1);
void setReminder(int minutes, bool onceOnly); void setReminder(int minutes, bool onceOnly);
Reminder* createReminder(QWidget* parent) Q_DECL_OVERRIDE; Reminder* createReminder(QWidget* parent) override;
static CheckBox* createConfirmAckCheckbox(QWidget* parent); static CheckBox* createConfirmAckCheckbox(QWidget* parent);
static QString i18n_chk_ConfirmAck(); // text of 'Confirm acknowledgement' checkbox static QString i18n_chk_ConfirmAck(); // text of 'Confirm acknowledgement' checkbox
protected: protected:
QString type_caption() const Q_DECL_OVERRIDE; QString type_caption() const override;
void type_init(QWidget* parent, QVBoxLayout* frameLayout) Q_DECL_OVERRIDE; void type_init(QWidget* parent, QVBoxLayout* frameLayout) override;
void type_initValues(const KAEvent*) Q_DECL_OVERRIDE; void type_initValues(const KAEvent*) override;
void type_showOptions(bool more) Q_DECL_OVERRIDE; void type_showOptions(bool more) override;
void setReadOnly(bool readOnly) Q_DECL_OVERRIDE; void setReadOnly(bool readOnly) override;
void saveState(const KAEvent*) Q_DECL_OVERRIDE; void saveState(const KAEvent*) override;
bool type_stateChanged() const Q_DECL_OVERRIDE; bool type_stateChanged() const override;
void type_setEvent(KAEvent&, const KDateTime&, const QString& text, int lateCancel, bool trial) Q_DECL_OVERRIDE; void type_setEvent(KAEvent&, const KDateTime&, const QString& text, int lateCancel, bool trial) override;
KAEvent::Flags getAlarmFlags() const Q_DECL_OVERRIDE; KAEvent::Flags getAlarmFlags() const override;
bool type_validate(bool trial) Q_DECL_OVERRIDE { Q_UNUSED(trial); return true; } bool type_validate(bool trial) override { Q_UNUSED(trial); return true; }
CheckBox* type_createConfirmAckCheckbox(QWidget* parent) Q_DECL_OVERRIDE { mConfirmAck = createConfirmAckCheckbox(parent); return mConfirmAck; } CheckBox* type_createConfirmAckCheckbox(QWidget* parent) override { mConfirmAck = createConfirmAckCheckbox(parent); return mConfirmAck; }
bool checkText(QString& result, bool showErrorMessage = true) const Q_DECL_OVERRIDE; bool checkText(QString& result, bool showErrorMessage = true) const override;
private Q_SLOTS: private Q_SLOTS:
void slotAlarmTypeChanged(int index); void slotAlarmTypeChanged(int index);
...@@ -148,25 +148,25 @@ class EditCommandAlarmDlg : public EditAlarmDlg ...@@ -148,25 +148,25 @@ class EditCommandAlarmDlg : public EditAlarmDlg
// Methods to initialise values in the New Alarm dialogue. // Methods to initialise values in the New Alarm dialogue.
// N.B. setTime() must be called first to set the date-only characteristic, // N.B. setTime() must be called first to set the date-only characteristic,
// followed by setRecurrence(). // followed by setRecurrence().
void setAction(KAEvent::SubAction, const AlarmText& = AlarmText()) Q_DECL_OVERRIDE; void setAction(KAEvent::SubAction, const AlarmText& = AlarmText()) override;
static QString i18n_chk_EnterScript(); // text of 'Enter a script' checkbox static QString i18n_chk_EnterScript(); // text of 'Enter a script' checkbox
static QString i18n_radio_ExecInTermWindow(); // text of 'Execute in terminal window' radio button static QString i18n_radio_ExecInTermWindow(); // text of 'Execute in terminal window' radio button
static QString i18n_chk_ExecInTermWindow(); // text of 'Execute in terminal window' checkbox static QString i18n_chk_ExecInTermWindow(); // text of 'Execute in terminal window' checkbox
protected: protected:
QString type_caption() const Q_DECL_OVERRIDE; QString type_caption() const override;
void type_init(QWidget* parent, QVBoxLayout* frameLayout) Q_DECL_OVERRIDE; void type_init(QWidget* parent, QVBoxLayout* frameLayout) override;
void type_initValues(const KAEvent*) Q_DECL_OVERRIDE; void type_initValues(const KAEvent*) override;
void type_showOptions(bool more) Q_DECL_OVERRIDE; void type_showOptions(bool more) override;
void setReadOnly(bool readOnly) Q_DECL_OVERRIDE; void setReadOnly(bool readOnly) override;
void saveState(const KAEvent*) Q_DECL_OVERRIDE; void saveState(const KAEvent*) override;
bool type_stateChanged() const Q_DECL_OVERRIDE; bool type_stateChanged() const override;
void type_setEvent(KAEvent&, const KDateTime&, const QString& text, int lateCancel, bool trial) Q_DECL_OVERRIDE; void type_setEvent(KAEvent&, const KDateTime&, const QString& text, int lateCancel, bool trial) override;
KAEvent::Flags getAlarmFlags() const Q_DECL_OVERRIDE; KAEvent::Flags getAlarmFlags() const override;
bool type_validate(bool trial) Q_DECL_OVERRIDE; bool type_validate(bool trial) override;
void type_executedTry(const QString& text, void* obj) Q_DECL_OVERRIDE; void type_executedTry(const QString& text, void* obj) override;
bool checkText(QString& result, bool showErrorMessage = true) const Q_DECL_OVERRIDE; bool checkText(QString& result, bool showErrorMessage = true) const override;
private Q_SLOTS: private Q_SLOTS:
void slotCmdScriptToggled(bool); void slotCmdScriptToggled(bool);
...@@ -200,7 +200,7 @@ class EditEmailAlarmDlg : public EditAlarmDlg ...@@ -200,7 +200,7 @@ class EditEmailAlarmDlg : public EditAlarmDlg
// Methods to initialise values in the New Alarm dialogue. // Methods to initialise values in the New Alarm dialogue.
// N.B. setTime() must be called first to set the date-only characteristic, // N.B. setTime() must be called first to set the date-only characteristic,
// followed by setRecurrence(). // followed by setRecurrence().
void setAction(KAEvent::SubAction, const AlarmText& = AlarmText()) Q_DECL_OVERRIDE; void setAction(KAEvent::SubAction, const AlarmText& = AlarmText()) override;
void setEmailFields(uint fromID, const KCalCore::Person::List&, const QString& subject, void setEmailFields(uint fromID, const KCalCore::Person::List&, const QString& subject,
const QStringList& attachments); const QStringList& attachments);
void setBcc(bool); void setBcc(bool);
...@@ -208,18 +208,18 @@ class EditEmailAlarmDlg : public EditAlarmDlg ...@@ -208,18 +208,18 @@ class EditEmailAlarmDlg : public EditAlarmDlg
static QString i18n_chk_CopyEmailToSelf(); // text of 'Copy email to self' checkbox static QString i18n_chk_CopyEmailToSelf(); // text of 'Copy email to self' checkbox
protected: protected:
QString type_caption() const Q_DECL_OVERRIDE; QString type_caption() const override;
void type_init(QWidget* parent, QVBoxLayout* frameLayout) Q_DECL_OVERRIDE; void type_init(QWidget* parent, QVBoxLayout* frameLayout) override;
void type_initValues(const KAEvent*) Q_DECL_OVERRIDE; void type_initValues(const KAEvent*) override;
void type_showOptions(bool) Q_DECL_OVERRIDE {} void type_showOptions(bool) override {}
void setReadOnly(bool readOnly) Q_DECL_OVERRIDE; void setReadOnly(bool readOnly) override;
void saveState(const KAEvent*) Q_DECL_OVERRIDE; void saveState(const KAEvent*) override;
bool type_stateChanged() const Q_DECL_OVERRIDE; bool type_stateChanged() const override;
void type_setEvent(KAEvent&, const KDateTime&, const QString& text, int lateCancel, bool trial) Q_DECL_OVERRIDE; void type_setEvent(KAEvent&, const KDateTime&, const QString& text, int lateCancel, bool trial) override;
KAEvent::Flags getAlarmFlags() const Q_DECL_OVERRIDE; KAEvent::Flags getAlarmFlags() const override;
bool type_validate(bool trial) Q_DECL_OVERRIDE; bool type_validate(bool trial) override;
void type_aboutToTry() Q_DECL_OVERRIDE; void type_aboutToTry() override;
bool checkText(QString& result, bool showErrorMessage = true) const Q_DECL_OVERRIDE; bool checkText(QString& result, bool showErrorMessage = true) const override;
private Q_SLOTS: private Q_SLOTS:
void slotTrySuccess(); void slotTrySuccess();
...@@ -266,25 +266,25 @@ class EditAudioAlarmDlg : public EditAlarmDlg ...@@ -266,25 +266,25 @@ class EditAudioAlarmDlg : public EditAlarmDlg
// Methods to initialise values in the New Alarm dialogue. // Methods to initialise values in the New Alarm dialogue.
// N.B. setTime() must be called first to set the date-only characteristic, // N.B. setTime() must be called first to set the date-only characteristic,
// followed by setRecurrence(). // followed by setRecurrence().
void setAction(KAEvent::SubAction, const AlarmText& = AlarmText()) Q_DECL_OVERRIDE; void setAction(KAEvent::SubAction, const AlarmText& = AlarmText()) override;
void setAudio(const QString& file, float volume = -1); void setAudio(const QString& file, float volume = -1);
protected: protected:
QString type_caption() const Q_DECL_OVERRIDE; QString type_caption() const override;
void type_init(QWidget* parent, QVBoxLayout* frameLayout) Q_DECL_OVERRIDE; void type_init(QWidget* parent, QVBoxLayout* frameLayout) override;
void type_initValues(const KAEvent*) Q_DECL_OVERRIDE; void type_initValues(const KAEvent*) override;
void type_showOptions(bool) Q_DECL_OVERRIDE {} void type_showOptions(bool) override {}
void setReadOnly(bool readOnly) Q_DECL_OVERRIDE; void setReadOnly(bool readOnly) override;
void saveState(const KAEvent*) Q_DECL_OVERRIDE; void saveState(const KAEvent*) override;
bool type_stateChanged() const Q_DECL_OVERRIDE; bool type_stateChanged() const override;
void type_setEvent(KAEvent&, const KDateTime&, const QString& text, int lateCancel, bool trial) Q_DECL_OVERRIDE; void type_setEvent(KAEvent&, const KDateTime&, const QString& text, int lateCancel, bool trial) override;
KAEvent::Flags getAlarmFlags() const Q_DECL_OVERRIDE; KAEvent::Flags getAlarmFlags() const override;
bool type_validate(bool trial) Q_DECL_OVERRIDE { Q_UNUSED(trial); return true; } bool type_validate(bool trial) override { Q_UNUSED(trial); return true; }
void type_executedTry(const QString& text, void* obj) Q_DECL_OVERRIDE; void type_executedTry(const QString& text, void* obj) override;
bool checkText(QString& result, bool showErrorMessage = true) const Q_DECL_OVERRIDE; bool checkText(QString& result, bool showErrorMessage = true) const override;
protected Q_SLOTS: protected Q_SLOTS:
void slotTry() Q_DECL_OVERRIDE; void slotTry() override;
private Q_SLOTS: private Q_SLOTS:
void audioWinDestroyed() { slotAudioPlaying(false); } void audioWinDestroyed() { slotAudioPlaying(false); }
......
...@@ -36,11 +36,11 @@ class EmailIdCombo : public KIdentityManagement::IdentityCombo ...@@ -36,11 +36,11 @@ class EmailIdCombo : public KIdentityManagement::IdentityCombo
void setReadOnly(bool ro) { mReadOnly = ro; } void setReadOnly(bool ro) { mReadOnly = ro; }
protected: protected:
void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE; void mousePressEvent(QMouseEvent*) override;
void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; void mouseReleaseEvent(QMouseEvent*) override;
void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE; void mouseMoveEvent(QMouseEvent*) override;
void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent*) override;
void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent*) override;
private: private:
bool mReadOnly; // value cannot be changed bool mReadOnly; // value cannot be changed
......
...@@ -57,8 +57,8 @@ class EventListView : public QTreeView ...@@ -57,8 +57,8 @@ class EventListView : public QTreeView
void findActive(bool); void findActive(bool);
protected: protected:
bool viewportEvent(QEvent*) Q_DECL_OVERRIDE; bool viewportEvent(QEvent*) override;
void contextMenuEvent(QContextMenuEvent*) Q_DECL_OVERRIDE; void contextMenuEvent(QContextMenuEvent*) override;
private: private:
void findNext(bool forward); void findNext(bool forward);
...@@ -73,8 +73,8 @@ class EventListDelegate : public QItemDelegate ...@@ -73,8 +73,8 @@ class EventListDelegate : public QItemDelegate
Q_OBJECT Q_OBJECT
public: public:
explicit EventListDelegate(EventListView* parent = nullptr) : QItemDelegate(parent) {} explicit EventListDelegate(EventListView* parent = nullptr) : QItemDelegate(parent) {}
QWidget* createEditor(QWidget*, const QStyleOptionViewItem&, const QModelIndex&) const Q_DECL_OVERRIDE { return nullptr; } QWidget* createEditor(QWidget*, const QStyleOptionViewItem&, const QModelIndex&) const override { return nullptr; }
bool editorEvent(QEvent*, QAbstractItemModel*, const QStyleOptionViewItem&, const QModelIndex&) Q_DECL_OVERRIDE; bool editorEvent(QEvent*, QAbstractItemModel*, const QStyleOptionViewItem&, const QModelIndex&) override;
virtual void edit(KAEvent*, EventListView*) = 0; virtual void edit(KAEvent*, EventListView*) = 0;
}; };
......
...@@ -51,7 +51,7 @@ class FontColourChooser : public QWidget ...@@ -51,7 +51,7 @@ class FontColourChooser : public QWidget
void setSampleText(const QString& text); void setSampleText(const QString& text);
bool isReadOnly() const { return mReadOnly; } bool isReadOnly() const { return mReadOnly; }
void setReadOnly(bool); void setReadOnly(bool);
bool eventFilter(QObject*, QEvent*) Q_DECL_OVERRIDE; bool eventFilter(QObject*, QEvent*) override;
private Q_SLOTS: private Q_SLOTS:
void setSampleColour(); void setSampleColour();
......
...@@ -42,9 +42,9 @@ class FontColourButton : public PushButton ...@@ -42,9 +42,9 @@ class FontColourButton : public PushButton
QFont font() const { return mFont; } QFont font() const { return mFont; }
QColor bgColour() const { return mBgColour; } QColor bgColour() const { return mBgColour; }
QColor fgColour() const { return mFgColour; } QColor fgColour() const { return mFgColour; }
void setReadOnly(bool ro, bool noHighlight = false) Q_DECL_OVERRIDE void setReadOnly(bool ro, bool noHighlight = false) override
{ mReadOnly = ro; PushButton::setReadOnly(ro, noHighlight); } { mReadOnly = ro; PushButton::setReadOnly(ro, noHighlight); }
bool isReadOnly() const Q_DECL_OVERRIDE { return mReadOnly; } bool isReadOnly() const override { return mReadOnly; }
Q_SIGNALS: Q_SIGNALS:
/** Signal emitted whenever a font or colour has been selected. */ /** Signal emitted whenever a font or colour has been selected. */
......
...@@ -53,8 +53,8 @@ class ItemListModel : public Akonadi::EntityMimeTypeFilterModel ...@@ -53,8 +53,8 @@ class ItemListModel : public Akonadi::EntityMimeTypeFilterModel
/** Determine whether the model contains any items. */ /** Determine whether the model contains any items. */
bool haveEvents() const; bool haveEvents() const;
int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; int columnCount(const QModelIndex& parent = QModelIndex()) const override;
Qt::ItemFlags flags(const QModelIndex&) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex&) const override;
static int iconWidth() { return AkonadiModel::iconSize().width(); } static int iconWidth() { return AkonadiModel::iconSize().width(); }
...@@ -65,7 +65,7 @@ class ItemListModel : public Akonadi::EntityMimeTypeFilterModel ...@@ -65,7 +65,7 @@ class ItemListModel : public Akonadi::EntityMimeTypeFilterModel
void haveEventsStatus(bool have); void haveEventsStatus(bool have);
protected: protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const Q_DECL_OVERRIDE; bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
private