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/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.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/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h')
-rw-r--r-- | src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h index 745b3e487..0b575c6c8 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h @@ -68,12 +68,12 @@ private: uint32_t getNextUniqueSurfaceId(); private: - QtWayland::ivi_application *m_iviApplication; - QtWayland::ivi_controller *m_iviController; - uint32_t m_lastSurfaceId; - uint32_t m_surfaceNumber; - bool m_useEnvSurfaceId; - QMutex m_mutex; + QtWayland::ivi_application *m_iviApplication = nullptr; + QtWayland::ivi_controller *m_iviController = nullptr; + uint32_t m_lastSurfaceId = 0; + uint32_t m_surfaceNumber = 0; + bool m_useEnvSurfaceId = false; + QMutex m_mutex{QMutex::Recursive}; }; } |