diff options
-rw-r--r-- | src/corelib/tools/qcontiguouscache.h | 4 | ||||
-rw-r--r-- | src/gui/text/qfontmetrics.h | 4 | ||||
-rw-r--r-- | src/printsupport/dialogs/qabstractprintdialog.h | 2 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h index 433e3f9ea4..592e31bfd2 100644 --- a/src/corelib/tools/qcontiguouscache.h +++ b/src/corelib/tools/qcontiguouscache.h @@ -107,9 +107,9 @@ public: #endif QContiguousCache<T> &operator=(const QContiguousCache<T> &other); - inline QContiguousCache<T> &operator=(QContiguousCache<T> &&other) + inline QContiguousCache<T> &operator=(QContiguousCache<T> &&other) noexcept { qSwap(d, other.d); return *this; } - inline void swap(QContiguousCache<T> &other) { qSwap(d, other.d); } + inline void swap(QContiguousCache<T> &other) noexcept { qSwap(d, other.d); } bool operator==(const QContiguousCache<T> &other) const; inline bool operator!=(const QContiguousCache<T> &other) const { return !(*this == other); } diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index a92ee9ed2f..02ff335e68 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -170,10 +170,10 @@ public: QFontMetricsF &operator=(const QFontMetricsF &); QFontMetricsF &operator=(const QFontMetrics &); - inline QFontMetricsF &operator=(QFontMetricsF &&other) + inline QFontMetricsF &operator=(QFontMetricsF &&other) noexcept { qSwap(d, other.d); return *this; } - void swap(QFontMetricsF &other) { qSwap(d, other.d); } + void swap(QFontMetricsF &other) noexcept { qSwap(d, other.d); } qreal ascent() const; qreal capHeight() const; diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h index 3cc89890fc..9817810c61 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.h +++ b/src/printsupport/dialogs/qabstractprintdialog.h @@ -84,8 +84,6 @@ public: explicit QAbstractPrintDialog(QPrinter *printer, QWidget *parent = nullptr); ~QAbstractPrintDialog(); - int exec() override = 0; - // obsolete void addEnabledOption(PrintDialogOption option); void setEnabledOptions(PrintDialogOptions options); diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 6eaf24adf9..5136ba13e5 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -1082,7 +1082,7 @@ void QPrintDialog::setVisible(bool visible) int QPrintDialog::exec() { - return QDialog::exec(); + return QAbstractPrintDialog::exec(); } void QPrintDialog::accept() |