Init variables where they are declared when possible (clang-tidy)

clang-tidy -p compile_commands.json $file \
    -checks='-*,modernize-use-default-member-init,readability-redundant-member-init' \
    -config='{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: "1"}]}' \
    -header-filter='qtwayland' \
    -fix

Afterwards I ran search and replace on the diff to clean up some whitespace errors:

- Replaced '(\n\+[^:\n]*)(:\s+\+\s+)' with '$1: '
- Replaced '(\n\+[^,\n]*)(,\s+\+\s+)' with '$1, '
- Replaced '\n\+\s*\n' with '\n'

I also had to do some manual edits, because for some reason, this particular
clang-tidy check doesn't trigger for some files.

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

1 files changed, 11 insertions, 15 deletions

diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h
index 5a21c3de7..28a19ff89 100644
--- a/src/compositor/compositor_api/qwaylandoutput_p.h
+++ b/src/compositor/compositor_api/qwaylandoutput_p.h
@@ -70,15 +70,11 @@ QT_BEGIN_NAMESPACE
 struct QWaylandSurfaceViewMapper
 {
     QWaylandSurfaceViewMapper()
-        : surface(nullptr)
-        , views()
-        , has_entered(false)
     {}
 
     QWaylandSurfaceViewMapper(QWaylandSurface *s, QWaylandView *v)
         : surface(s)
         , views(1, v)
-        , has_entered(false)
     {}
 
     QWaylandView *maybePrimaryView() const
@@ -90,9 +86,9 @@ struct QWaylandSurfaceViewMapper
         return nullptr;
     }
 
-    QWaylandSurface *surface;
+    QWaylandSurface *surface = nullptr;
     QVector<QWaylandView *> views;
-    bool has_entered;
+    bool has_entered = false;
 };
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandOutputPrivate : public QObjectPrivate, public QtWaylandServer::wl_output
@@ -116,22 +112,22 @@ protected:
     void output_bind_resource(Resource *resource) override;
 
 private:
-    QWaylandCompositor *compositor;
-    QWindow *window;
+    QWaylandCompositor *compositor = nullptr;
+    QWindow *window = nullptr;
     QString manufacturer;
     QString model;
     QPoint position;
     QVector<QWaylandOutputMode> modes;
-    int currentMode;
-    int preferredMode;
+    int currentMode = -1;
+    int preferredMode = -1;
     QRect availableGeometry;
     QVector<QWaylandSurfaceViewMapper> surfaceViews;
     QSize physicalSize;
-    QWaylandOutput::Subpixel subpixel;
-    QWaylandOutput::Transform transform;
-    int scaleFactor;
-    bool sizeFollowsWindow;
-    bool initialized;
+    QWaylandOutput::Subpixel subpixel = QWaylandOutput::SubpixelUnknown;
+    QWaylandOutput::Transform transform = QWaylandOutput::TransformNormal;
+    int scaleFactor = 1;
+    bool sizeFollowsWindow = false;
+    bool initialized = false;
 
     Q_DECLARE_PUBLIC(QWaylandOutput)
     Q_DISABLE_COPY(QWaylandOutputPrivate)