diff options
Diffstat (limited to 'src/widgets/widgets/qeffects.cpp')
| -rw-r--r-- | src/widgets/widgets/qeffects.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/widgets/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp index d4ef33966b..bcc8d7815d 100644 --- a/src/widgets/widgets/qeffects.cpp +++ b/src/widgets/widgets/qeffects.cpp @@ -71,10 +71,10 @@ public: void run(int time); protected: - void paintEvent(QPaintEvent* e) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent*) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent* e) override; + void closeEvent(QCloseEvent*) override; void alphaBlend(); - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; protected slots: void render(); @@ -98,9 +98,12 @@ static QAlphaWidget* q_blend = 0; /* Constructs a QAlphaWidget. */ +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED // QDesktopWidget::screen() QAlphaWidget::QAlphaWidget(QWidget* w, Qt::WindowFlags f) : QWidget(QApplication::desktop()->screen(QDesktopWidgetPrivate::screenNumber(w)), f) { +QT_WARNING_POP #ifndef Q_OS_WIN setEnabled(false); #endif @@ -348,8 +351,8 @@ public: void run(int time); protected: - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent*) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent*) override; + void closeEvent(QCloseEvent*) override; private slots: void scroll(); |