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/extensions/qwaylandquickshellsurfaceitem_p.h | |
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/extensions/qwaylandquickshellsurfaceitem_p.h')
-rw-r--r-- | src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h index 9549cb0e3..abb56221e 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h @@ -65,14 +65,10 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellSurfaceItemPrivate : public { public: QWaylandQuickShellSurfaceItemPrivate() - : QWaylandQuickItemPrivate() - , m_shellIntegration(nullptr) - , m_shellSurface(nullptr) - , m_moveItem(nullptr) {} - QWaylandQuickShellIntegration *m_shellIntegration; - QWaylandShellSurface *m_shellSurface; - QQuickItem *m_moveItem; + QWaylandQuickShellIntegration *m_shellIntegration = nullptr; + QWaylandShellSurface *m_shellSurface = nullptr; + QQuickItem *m_moveItem = nullptr; }; class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellIntegration : public QObject @@ -100,10 +96,10 @@ private: QWaylandQuickShellEventFilter(QObject *parent = nullptr); bool eventFilter(QObject *, QEvent *) override; - bool eventFilterInstalled; - bool waitForRelease; + bool eventFilterInstalled = false; + bool waitForRelease = false; QPointer<QWaylandClient> client; - CallbackFunction closePopups; + CallbackFunction closePopups = nullptr; QBasicTimer mousePressTimeout; static QWaylandQuickShellEventFilter *self; }; |