Commit 2b000daf authored by Laurent Montel's avatar Laurent Montel 😁

Use Q_DECL_OVERRIDE

parent 5be97880
......@@ -44,7 +44,7 @@ class FindSaneDevicesThread : public QThread
public:
static FindSaneDevicesThread *getInstance();
~FindSaneDevicesThread();
void run();
void run() Q_DECL_OVERRIDE;
const QList<KSaneWidget::DeviceInfo> devicesList() const;
......
......@@ -55,7 +55,7 @@ public:
} ReadStatus;
KSanePreviewThread(SANE_Handle handle, QImage *img);
void run();
void run() Q_DECL_OVERRIDE;
void setPreviewInverted(bool);
void cancelScan();
int scanProgress();
......
......@@ -55,7 +55,7 @@ public:
} ReadStatus;
KSaneScanThread(SANE_Handle handle, QByteArray *data);
void run();
void run() Q_DECL_OVERRIDE;
void setImageInverted(bool);
void cancelScan();
int scanProgress();
......
......@@ -47,7 +47,7 @@ public:
* \param area this parameter determine the area of the reduced sized image. */
void findSelections(float area = 10000.0);
virtual QSize sizeHint() const;
QSize sizeHint() const Q_DECL_OVERRIDE;
public Q_SLOTS:
......@@ -96,11 +96,11 @@ Q_SIGNALS:
void newSelection(float tl_x, float tl_y, float br_x, float br_y);
protected:
void wheelEvent(QWheelEvent *e);
void mousePressEvent(QMouseEvent *e);
void mouseReleaseEvent(QMouseEvent *e);
void mouseMoveEvent(QMouseEvent *e);
void drawBackground(QPainter *painter, const QRectF &rect);
void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
void drawBackground(QPainter *painter, const QRectF &rect) Q_DECL_OVERRIDE;
private:
void updateSelVisibility();
......
......@@ -42,9 +42,9 @@ class KSaneOptButton : public KSaneOption
public:
KSaneOptButton(const SANE_Handle handle, const int index);
void createWidget(QWidget *parent);
void createWidget(QWidget *parent) Q_DECL_OVERRIDE;
bool hasGui();
bool hasGui() Q_DECL_OVERRIDE;
private Q_SLOTS:
void buttonClicked();
......
......@@ -42,15 +42,15 @@ class KSaneOptCheckBox : public KSaneOption
public:
KSaneOptCheckBox(const SANE_Handle handle, const int index);
void createWidget(QWidget *parent);
void createWidget(QWidget *parent) Q_DECL_OVERRIDE;
void readValue();
void readValue() Q_DECL_OVERRIDE;
bool getValue(float &val);
bool setValue(float val);
bool getValue(QString &val);
bool setValue(const QString &val);
bool hasGui();
bool getValue(float &val) Q_DECL_OVERRIDE;
bool setValue(float val) Q_DECL_OVERRIDE;
bool getValue(QString &val) Q_DECL_OVERRIDE;
bool setValue(const QString &val) Q_DECL_OVERRIDE;
bool hasGui() Q_DECL_OVERRIDE;
private Q_SLOTS:
void checkboxChanged(bool toggled);
......
......@@ -42,17 +42,17 @@ class KSaneOptCombo : public KSaneOption
public:
KSaneOptCombo(const SANE_Handle handle, const int index);
void createWidget(QWidget *parent);
void createWidget(QWidget *parent) Q_DECL_OVERRIDE;
void readValue();
void readOption();
void readValue() Q_DECL_OVERRIDE;
void readOption() Q_DECL_OVERRIDE;
bool getMinValue(float &max);
bool getValue(float &val);
bool setValue(float val);
bool getValue(QString &val);
bool setValue(const QString &val);
bool hasGui();
bool getMinValue(float &max) Q_DECL_OVERRIDE;
bool getValue(float &val) Q_DECL_OVERRIDE;
bool setValue(float val) Q_DECL_OVERRIDE;
bool getValue(QString &val) Q_DECL_OVERRIDE;
bool setValue(const QString &val) Q_DECL_OVERRIDE;
bool hasGui() Q_DECL_OVERRIDE;
private Q_SLOTS:
void comboboxChangedIndex(int val);
......
......@@ -42,15 +42,15 @@ class KSaneOptEntry : public KSaneOption
public:
KSaneOptEntry(const SANE_Handle handle, const int index);
void createWidget(QWidget *parent);
void createWidget(QWidget *parent) Q_DECL_OVERRIDE;
void readValue();
void readValue() Q_DECL_OVERRIDE;
bool getValue(float &val);
bool setValue(float val);
bool getValue(QString &val);
bool setValue(const QString &val);
bool hasGui();
bool getValue(float &val) Q_DECL_OVERRIDE;
bool setValue(float val) Q_DECL_OVERRIDE;
bool getValue(QString &val) Q_DECL_OVERRIDE;
bool setValue(const QString &val) Q_DECL_OVERRIDE;
bool hasGui() Q_DECL_OVERRIDE;
private Q_SLOTS:
void entryChanged(const QString &text);
......
......@@ -42,18 +42,18 @@ class KSaneOptFSlider : public KSaneOption
public:
KSaneOptFSlider(const SANE_Handle handle, const int index);
void createWidget(QWidget *parent);
void createWidget(QWidget *parent) Q_DECL_OVERRIDE;
void readValue();
void readOption();
void readValue() Q_DECL_OVERRIDE;
void readOption() Q_DECL_OVERRIDE;
bool getMinValue(float &max);
bool getMaxValue(float &max);
bool getValue(float &val);
bool setValue(float val);
bool getValue(QString &val);
bool setValue(const QString &val);
bool hasGui();
bool getMinValue(float &max) Q_DECL_OVERRIDE;
bool getMaxValue(float &max) Q_DECL_OVERRIDE;
bool getValue(float &val) Q_DECL_OVERRIDE;
bool setValue(float val) Q_DECL_OVERRIDE;
bool getValue(QString &val) Q_DECL_OVERRIDE;
bool setValue(const QString &val) Q_DECL_OVERRIDE;
bool hasGui() Q_DECL_OVERRIDE;
Q_SIGNALS:
void fValueRead(float);
......
......@@ -42,15 +42,15 @@ class KSaneOptGamma : public KSaneOption
public:
KSaneOptGamma(const SANE_Handle handle, const int index);
void createWidget(QWidget *parent);
void createWidget(QWidget *parent) Q_DECL_OVERRIDE;
void readValue();
void readValue() Q_DECL_OVERRIDE;
bool getValue(float &val);
bool setValue(float val);
bool getValue(QString &val);
bool setValue(const QString &val);
bool hasGui();
bool getValue(float &val) Q_DECL_OVERRIDE;
bool setValue(float val) Q_DECL_OVERRIDE;
bool getValue(QString &val) Q_DECL_OVERRIDE;
bool setValue(const QString &val) Q_DECL_OVERRIDE;
bool hasGui() Q_DECL_OVERRIDE;
private Q_SLOTS:
void gammaTableChanged(const QVector<int> &gam_tbl);
......
......@@ -42,18 +42,18 @@ class KSaneOptSlider : public KSaneOption
public:
KSaneOptSlider(const SANE_Handle handle, const int index);
void createWidget(QWidget *parent);
void createWidget(QWidget *parent) Q_DECL_OVERRIDE;
void readValue();
void readOption();
void readValue() Q_DECL_OVERRIDE;
void readOption() Q_DECL_OVERRIDE;
bool getMinValue(float &max);
bool getMaxValue(float &max);
bool getValue(float &val);
bool setValue(float val);
bool getValue(QString &val);
bool setValue(const QString &val);
bool hasGui();
bool getMinValue(float &max) Q_DECL_OVERRIDE;
bool getMaxValue(float &max) Q_DECL_OVERRIDE;
bool getValue(float &val) Q_DECL_OVERRIDE;
bool setValue(float val) Q_DECL_OVERRIDE;
bool getValue(QString &val) Q_DECL_OVERRIDE;
bool setValue(const QString &val) Q_DECL_OVERRIDE;
bool hasGui() Q_DECL_OVERRIDE;
Q_SIGNALS:
void fValueRead(float);
......
......@@ -67,8 +67,8 @@ public:
public:
// Graphics Item methods
QRectF boundingRect() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
QRectF boundingRect() const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
private:
struct Private;
......
......@@ -44,7 +44,7 @@ public:
SplitterCollapser(QSplitter *, QWidget *widget);
~SplitterCollapser();
virtual QSize sizeHint() const;
QSize sizeHint() const Q_DECL_OVERRIDE;
public Q_SLOTS:
void slotCollapse();
......@@ -52,9 +52,9 @@ public Q_SLOTS:
void slotSetCollapsed(bool collapsed);
protected:
virtual bool eventFilter(QObject *, QEvent *);
bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE;
virtual void paintEvent(QPaintEvent *);
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;
private:
SplitterCollapserPrivate *const d;
......
......@@ -54,15 +54,15 @@ public:
GammaDisp(QWidget *parent, QVector<int> *tbl);
~GammaDisp() {}
QSize sizeHint() const;
QSize minimumSizeHint() const;
QSize sizeHint() const Q_DECL_OVERRIDE;
QSize minimumSizeHint() const Q_DECL_OVERRIDE;
void setColor(const QColor &color);
protected:
void paintEvent(QPaintEvent *);
void resizeEvent(QResizeEvent *);
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE;
private:
......
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