Commit 8a4e31bc authored by Hugo Pereira Da Costa's avatar Hugo Pereira Da Costa

Q_DECL_OVERRIDE -> override

Rationale is that oxygen decoration depends on libkdecoration, which uses override directly already.

CCBUG: 380452
parent 1bf982f4
......@@ -57,15 +57,15 @@ namespace Oxygen
public Q_SLOTS:
//* read current configuration
void load( void ) Q_DECL_OVERRIDE;
void load( void ) override;
//* save current configuration
void save( void ) Q_DECL_OVERRIDE;
void save( void ) override;
protected Q_SLOTS:
//* check whether configuration is changed and emit appropriate signal if yes
void updateChanged() Q_DECL_OVERRIDE;
void updateChanged() override;
private:
......
......@@ -78,7 +78,7 @@ namespace Oxygen
protected:
bool eventFilter( QObject* o, QEvent* e ) Q_DECL_OVERRIDE;
bool eventFilter( QObject* o, QEvent* e ) override;
private:
......
......@@ -53,13 +53,13 @@ namespace Oxygen
//@{
//* return data for a given index
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role) const override;
//* header data
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
//* number of columns for a given index
int columnCount(const QModelIndex& ) const Q_DECL_OVERRIDE
int columnCount(const QModelIndex& ) const override
{ return nColumns; }
//@}
......@@ -67,7 +67,7 @@ namespace Oxygen
protected:
//* sort
void privateSort( int, Qt::SortOrder ) Q_DECL_OVERRIDE
void privateSort( int, Qt::SortOrder ) override
{}
private:
......
......@@ -55,7 +55,7 @@ namespace Oxygen
{ sort( sortColumn(), sortOrder() ); }
//* sort
void sort( int column, Qt::SortOrder order = Qt::AscendingOrder ) Q_DECL_OVERRIDE;
void sort( int column, Qt::SortOrder order = Qt::AscendingOrder ) override;
//* current sorting column
const int& sortColumn( void ) const
......
......@@ -55,7 +55,7 @@ namespace Oxygen
static Button *create(KDecoration2::DecorationButtonType type, KDecoration2::Decoration *decoration, QObject *parent);
//* render
virtual void paint(QPainter *painter, const QRect &repaintRegion) Q_DECL_OVERRIDE;
virtual void paint(QPainter *painter, const QRect &repaintRegion) override;
//* flag
enum Flag
......
......@@ -44,7 +44,7 @@ namespace Oxygen
{}
//* reset all caches
void invalidateCaches() Q_DECL_OVERRIDE;
void invalidateCaches() override;
//* windeco buttons
virtual QPixmap windecoButton(const QColor &color, const QColor& glow, bool sunken, int size = 21);
......
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