Optimize QQuickImagePrivate padding

Since the parent QQuickImageBasePrivate class ends with a bool bitfield,
starting QQuickImagePrivate with its own bitfield seems to cause them to
dovetail: at least the warnings about padding are eliminated.  It's
anyway nice to group variables by size (although in reverse order),
group methods separately, and do header initialization as much as
possible.

Change-Id: I934e4ad682e338ebb62721ed40c60ff9d4465600
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

2 files changed, 7 insertions, 14 deletions

diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 840cfe15da..fccacdcce8 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -76,14 +76,8 @@ QSGTexture *QQuickImageTextureProvider::texture() const {
 }
 
 QQuickImagePrivate::QQuickImagePrivate()
-    : fillMode(QQuickImage::Stretch)
-    , paintedWidth(0)
-    , paintedHeight(0)
-    , pixmapChanged(false)
+    : pixmapChanged(false)
     , mipmap(false)
-    , hAlign(QQuickImage::AlignHCenter)
-    , vAlign(QQuickImage::AlignVCenter)
-    , provider(nullptr)
 {
 }
 
diff --git a/src/quick/items/qquickimage_p_p.h b/src/quick/items/qquickimage_p_p.h
index e2c467c311..1c4ba88655 100644
--- a/src/quick/items/qquickimage_p_p.h
+++ b/src/quick/items/qquickimage_p_p.h
@@ -80,19 +80,18 @@ class Q_QUICK_PRIVATE_EXPORT QQuickImagePrivate : public QQuickImageBasePrivate
 
 public:
     QQuickImagePrivate();
-
-    QQuickImage::FillMode fillMode;
-    qreal paintedWidth;
-    qreal paintedHeight;
     void setImage(const QImage &img);
     void setPixmap(const QQuickPixmap &pixmap);
 
     bool pixmapChanged : 1;
     bool mipmap : 1;
-    QQuickImage::HAlignment hAlign;
-    QQuickImage::VAlignment vAlign;
+    QQuickImage::HAlignment hAlign = QQuickImage::AlignHCenter;
+    QQuickImage::VAlignment vAlign = QQuickImage::AlignVCenter;
+    QQuickImage::FillMode fillMode = QQuickImage::Stretch;
 
-    QQuickImageTextureProvider *provider;
+    qreal paintedWidth = 0;
+    qreal paintedHeight = 0;
+    QQuickImageTextureProvider *provider = nullptr;
 };
 
 QT_END_NAMESPACE