OSDN Git Service

remove unused QFramePrivate::frect member
authorIvailo Monev <xakepa10@gmail.com>
Thu, 15 Oct 2020 19:09:01 +0000 (22:09 +0300)
committerIvailo Monev <xakepa10@gmail.com>
Thu, 15 Oct 2020 19:09:01 +0000 (22:09 +0300)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/gui/widgets/qframe.cpp
src/gui/widgets/qframe_p.h

index 44f9829..60197e7 100644 (file)
@@ -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)
index 1802ffe..9a2ee1e 100644 (file)
@@ -59,7 +59,6 @@ public:
     void        updateFrameWidth();
     void        updateStyledFrameWidths();
 
-    QRect       frect;
     int         frameStyle;
     short       lineWidth;
     short       midLineWidth;