From 5180f32c5abe01acd65cde68c2c16aedda4028ec Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Sun, 16 Nov 2014 13:09:01 +0100
Subject: Add Q_DECL_OVERRIDE in the src subdirectory

Done automatically with clang-modernize on linux

(But does not add Q_DECL_OVERRIDE to the function that are marked
 as inline because it a compilation error with MSVC2010)

Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/printsupport/dialogs/qpagesetupdialog.h        | 4 ++--
 src/printsupport/dialogs/qpagesetupdialog_unix.cpp | 2 +-
 src/printsupport/dialogs/qprintdialog.h            | 8 ++++----
 src/printsupport/dialogs/qprintdialog_unix.cpp     | 4 ++--
 src/printsupport/dialogs/qprintpreviewdialog.cpp   | 8 ++++----
 src/printsupport/dialogs/qprintpreviewdialog.h     | 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/printsupport/dialogs')

diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h
index a6edf91cd1..5952952623 100644
--- a/src/printsupport/dialogs/qpagesetupdialog.h
+++ b/src/printsupport/dialogs/qpagesetupdialog.h
@@ -58,7 +58,7 @@ public:
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
     virtual void setVisible(bool visible);
 #endif
-    virtual int exec();
+    virtual int exec() Q_DECL_OVERRIDE;
 
 #ifdef Q_NO_USING_KEYWORD
 #ifndef Q_QDOC
@@ -69,7 +69,7 @@ public:
 #endif
     void open(QObject *receiver, const char *member);
 
-    void done(int result);
+    void done(int result) Q_DECL_OVERRIDE;
 
     QPrinter *printer();
 };
diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
index a013ed82d3..2651522c47 100644
--- a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
+++ b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp
@@ -110,7 +110,7 @@ public:
     }
 
 protected:
-    void paintEvent(QPaintEvent *)
+    void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE
     {
         QSize pageSize = m_pageLayout.fullRectPoints().size();
         QSizeF scaledSize = pageSize.scaled(width() - 10, height() - 10, Qt::KeepAspectRatio);
diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h
index 437c2831d4..768951ae17 100644
--- a/src/printsupport/dialogs/qprintdialog.h
+++ b/src/printsupport/dialogs/qprintdialog.h
@@ -57,11 +57,11 @@ public:
     explicit QPrintDialog(QWidget *parent = 0);
     ~QPrintDialog();
 
-    int exec();
+    int exec() Q_DECL_OVERRIDE;
 #if defined (Q_OS_UNIX) && !defined(Q_OS_MAC)
-    virtual void accept();
+    virtual void accept() Q_DECL_OVERRIDE;
 #endif
-    void done(int result);
+    void done(int result) Q_DECL_OVERRIDE;
 
     void setOption(PrintDialogOption option, bool on = true);
     bool testOption(PrintDialogOption option) const;
@@ -69,7 +69,7 @@ public:
     PrintDialogOptions options() const;
 
 #if defined(Q_OS_UNIX) || defined(Q_OS_WIN)
-    void setVisible(bool visible);
+    void setVisible(bool visible) Q_DECL_OVERRIDE;
 #endif
 
 #ifdef Q_NO_USING_KEYWORD
diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index f40a08dd7e..95f128c6ae 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -119,7 +119,7 @@ public:
     void setupPrinter() const;
 
 protected:
-    void showEvent(QShowEvent* event);
+    void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
 private:
     friend class QUnixPrintWidgetPrivate;
@@ -205,7 +205,7 @@ public:
     void setupPrinter();
     void updateWidgets();
 
-    virtual void setTabs(const QList<QWidget*> &tabs);
+    virtual void setTabs(const QList<QWidget*> &tabs) Q_DECL_OVERRIDE;
 
     Ui::QPrintSettingsOutput options;
     QUnixPrintWidget *top;
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp
index 9c40e7dd51..a71f2122dc 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.cpp
+++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp
@@ -73,7 +73,7 @@ class QPrintPreviewMainWindow : public QMainWindow
 {
 public:
     QPrintPreviewMainWindow(QWidget *parent) : QMainWindow(parent) {}
-    QMenu *createPopupMenu() { return 0; }
+    QMenu *createPopupMenu() Q_DECL_OVERRIDE { return 0; }
 };
 
 class ZoomFactorValidator : public QDoubleValidator
@@ -84,7 +84,7 @@ public:
     ZoomFactorValidator(qreal bottom, qreal top, int decimals, QObject *parent)
         : QDoubleValidator(bottom, top, decimals, parent) {}
 
-    State validate(QString &input, int &pos) const
+    State validate(QString &input, int &pos) const Q_DECL_OVERRIDE
     {
         bool replacePercent = false;
         if (input.endsWith(QLatin1Char('%'))) {
@@ -117,13 +117,13 @@ public:
     }
 
 protected:
-    void focusInEvent(QFocusEvent *e)
+    void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE
     {
         origText = text();
         QLineEdit::focusInEvent(e);
     }
 
-    void focusOutEvent(QFocusEvent *e)
+    void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE
     {
         if (isModified() && !hasAcceptableInput())
             setText(origText);
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h
index 423a27db12..83d0fe15a6 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.h
+++ b/src/printsupport/dialogs/qprintpreviewdialog.h
@@ -67,8 +67,8 @@ public:
 
     QPrinter *printer();
 
-    void setVisible(bool visible);
-    void done(int result);
+    void setVisible(bool visible) Q_DECL_OVERRIDE;
+    void done(int result) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void paintRequested(QPrinter *printer);
-- 
cgit v1.2.3