Commit 01691c2b authored by Laurent Montel's avatar Laurent Montel 😁

Use Q_DECL_OVERRIDE Q_NULLPTR

parent 5dce6496
......@@ -32,9 +32,9 @@ class AlarmListDelegate : public EventListDelegate
public:
explicit AlarmListDelegate(AlarmListView* parent = 0)
: EventListDelegate(parent) {}
virtual void paint(QPainter*, const QStyleOptionViewItem&, const QModelIndex&) const;
virtual QSize sizeHint(const QStyleOptionViewItem&, const QModelIndex&) const;
virtual void edit(KAEvent*, EventListView*);
virtual void paint(QPainter*, const QStyleOptionViewItem&, const QModelIndex&) const Q_DECL_OVERRIDE;
virtual QSize sizeHint(const QStyleOptionViewItem&, const QModelIndex&) const Q_DECL_OVERRIDE;
void edit(KAEvent*, EventListView*) Q_DECL_OVERRIDE;
};
#endif
......
......@@ -33,7 +33,7 @@ class AlarmListView : public EventListView
Q_OBJECT
public:
explicit AlarmListView(const QByteArray& configGroup, QWidget* parent = 0);
virtual void setModel(QAbstractItemModel*);
void setModel(QAbstractItemModel*) Q_DECL_OVERRIDE;
void selectTimeColumns(bool time, bool timeTo);
private Q_SLOTS:
......
......@@ -85,7 +85,7 @@ class BLineEdit : public QLineEdit
void focusLost();
protected:
virtual void focusOutEvent(QFocusEvent*) { emit focusLost(); }
virtual void focusOutEvent(QFocusEvent*) Q_DECL_OVERRIDE { emit focusLost(); }
};
#endif // BIRTHDAYDLG_H
......
......@@ -55,8 +55,8 @@ class BirthdayModel : public Akonadi::ContactsTreeModel
*/
static BirthdayModel* instance();
virtual QVariant entityData(const Akonadi::Item&, int column, int role = Qt::DisplayRole) const;
virtual QVariant entityData(const Akonadi::Collection& collection, int column, int role = Qt::DisplayRole) const
virtual QVariant entityData(const Akonadi::Item&, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
virtual QVariant entityData(const Akonadi::Collection& collection, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE
{ return Akonadi::ContactsTreeModel::entityData(collection, column, role); }
private:
......
......@@ -147,9 +147,9 @@ class CollectionView : public QListView
Akonadi::Collection collection(const QModelIndex&) const;
protected:
virtual void setModel(QAbstractItemModel*);
virtual void mouseReleaseEvent(QMouseEvent*);
virtual bool viewportEvent(QEvent*);
void setModel(QAbstractItemModel*) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE;
bool viewportEvent(QEvent*) Q_DECL_OVERRIDE;
};
......
......@@ -57,9 +57,8 @@ class EventListView : public QTreeView
void findActive(bool);
protected:
virtual bool viewportEvent(QEvent*);
virtual void contextMenuEvent(QContextMenuEvent*);
bool viewportEvent(QEvent*) Q_DECL_OVERRIDE;
void contextMenuEvent(QContextMenuEvent*) Q_DECL_OVERRIDE;
private:
void findNext(bool forward);
......@@ -74,7 +73,7 @@ class EventListDelegate : public QItemDelegate
Q_OBJECT
public:
explicit EventListDelegate(EventListView* parent = 0) : QItemDelegate(parent) {}
virtual QWidget* createEditor(QWidget*, const QStyleOptionViewItem&, const QModelIndex&) const { return 0; }
virtual QWidget* createEditor(QWidget*, const QStyleOptionViewItem&, const QModelIndex&) const Q_DECL_OVERRIDE { return 0; }
virtual bool editorEvent(QEvent*, QAbstractItemModel*, const QStyleOptionViewItem&, const QModelIndex&);
virtual void edit(KAEvent*, EventListView*) = 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