From 60a6f3f3da1209674dc57d72dff0559cde47bbf1 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 11 Sep 2020 13:35:45 +0200 Subject: [PATCH] Remove dead code and obsolete comment The special members do nothing that the compiler-generated default doesn't do, so remove them. Remove the comment introduced in d06b4ca9a1a9baf3faa83a8b0 about QBitmap inherting QPixmap being a problem. It which wasn't followed up on for Qt 6, and making QBitmap a QPaintDevice rather than a QPixmap subclass (as implied in the commit message) would result in significant code duplication. Change-Id: I8d5032062f95ab19b38eb97d17191a9b13af870f Reviewed-by: Lars Knoll --- src/gui/image/qbitmap.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h index 2bdfa73bdf..a114db17e0 100644 --- a/src/gui/image/qbitmap.h +++ b/src/gui/image/qbitmap.h @@ -56,14 +56,6 @@ public: QBitmap(int w, int h); explicit QBitmap(const QSize &); explicit QBitmap(const QString &fileName, const char *format = nullptr); - // ### Qt 6: don't inherit QPixmap -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - QBitmap(const QBitmap &other) : QPixmap(other) {} - // QBitmap(QBitmap &&other) : QPixmap(std::move(other)) {} // QPixmap doesn't, yet, have a move ctor - QBitmap &operator=(const QBitmap &other) { QPixmap::operator=(other); return *this; } - QBitmap &operator=(QBitmap &&other) noexcept { QPixmap::operator=(std::move(other)); return *this; } - ~QBitmap(); -#endif QBitmap &operator=(const QPixmap &); inline void swap(QBitmap &other) { QPixmap::swap(other); } // prevent QBitmap<->QPixmap swaps