From a48d8b866940eae192ceea369b5ff16bde442d1c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 15 Oct 2020 22:09:01 +0300 Subject: [PATCH] remove unused QFramePrivate::frect member Signed-off-by: Ivailo Monev --- src/gui/widgets/qframe.cpp | 7 ++----- src/gui/widgets/qframe_p.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gui/widgets/qframe.cpp b/src/gui/widgets/qframe.cpp index 44f9829a8..60197e795 100644 --- a/src/gui/widgets/qframe.cpp +++ b/src/gui/widgets/qframe.cpp @@ -44,8 +44,7 @@ QT_BEGIN_NAMESPACE QFramePrivate::QFramePrivate() - : frect(QRect(0, 0, 0, 0)), - frameStyle(QFrame::NoFrame | QFrame::Plain), + : frameStyle(QFrame::NoFrame | QFrame::Plain), lineWidth(1), midLineWidth(0), frameWidth(0), @@ -434,9 +433,7 @@ int QFrame::frameWidth() const QRect QFrame::frameRect() const { Q_D(const QFrame); - QRect fr = contentsRect(); - fr.adjust(-d->leftFrameWidth, -d->topFrameWidth, d->rightFrameWidth, d->bottomFrameWidth); - return fr; + return contentsRect().adjusted(-d->leftFrameWidth, -d->topFrameWidth, d->rightFrameWidth, d->bottomFrameWidth); } void QFrame::setFrameRect(const QRect &r) diff --git a/src/gui/widgets/qframe_p.h b/src/gui/widgets/qframe_p.h index 1802ffeb8..9a2ee1ea9 100644 --- a/src/gui/widgets/qframe_p.h +++ b/src/gui/widgets/qframe_p.h @@ -59,7 +59,6 @@ public: void updateFrameWidth(); void updateStyledFrameWidths(); - QRect frect; int frameStyle; short lineWidth; short midLineWidth; -- 2.11.0