diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-27 11:32:15 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2018-02-27 17:03:41 +0000 |
commit | c4bd9198b4a0fac809903dd2c09276c2c3c1b22e (patch) | |
tree | 83325fe11d258c922ede480e0ad3de3df45032fa /src/compositor/compositor_api/qwaylandsurface.cpp | |
parent | 72999738489b5251d025c954a77c93e8e1fdfd9d (diff) |
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>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index a5316f535..ed9bef3cf 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -75,7 +75,6 @@ public: FrameCallback(QWaylandSurface *surf, wl_resource *res) : surface(surf) , resource(res) - , canSend(false) { #if WAYLAND_VERSION_MAJOR < 1 || (WAYLAND_VERSION_MAJOR == 1 && WAYLAND_VERSION_MINOR <= 2) res->data = this; @@ -112,7 +111,7 @@ public: } QWaylandSurface *surface; wl_resource *resource; - bool canSend; + bool canSend = false; }; } static QRegion infiniteRegion() { @@ -125,22 +124,7 @@ QList<QWaylandSurfacePrivate *> QWaylandSurfacePrivate::uninitializedSurfaces; #endif QWaylandSurfacePrivate::QWaylandSurfacePrivate() - : QtWaylandServer::wl_surface() - , compositor(nullptr) - , refCount(1) - , client(nullptr) - , role(nullptr) - , inputRegion(infiniteRegion()) - , bufferScale(1) - , isCursorSurface(false) - , destroyed(false) - , hasContent(false) - , isInitialized(false) - , contentOrientation(Qt::PrimaryOrientation) -#if QT_CONFIG(im) - , inputMethodControl(nullptr) -#endif - , subsurface(nullptr) + : inputRegion(infiniteRegion()) { pending.buffer = QWaylandBufferRef(); pending.newlyAttached = false; |