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 | |
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')
8 files changed, 11 insertions, 24 deletions
diff --git a/src/plugins/decorations/bradient/main.cpp b/src/plugins/decorations/bradient/main.cpp index ceb07c803..9a7e91e6f 100644 --- a/src/plugins/decorations/bradient/main.cpp +++ b/src/plugins/decorations/bradient/main.cpp @@ -153,14 +153,12 @@ private: QColor m_foregroundColor; QColor m_backgroundColor; QStaticText m_windowTitle; - Button m_clicking; + Button m_clicking = None; }; QWaylandBradientDecoration::QWaylandBradientDecoration() - : QWaylandAbstractDecoration() - , m_clicking(None) { QPalette palette; m_foregroundColor = palette.color(QPalette::Active, QPalette::HighlightedText); diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h index dde430381..625583913 100644 --- a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h @@ -52,8 +52,7 @@ class QWaylandEglPlatformIntegration : public QWaylandIntegration { public: QWaylandEglPlatformIntegration() - : QWaylandIntegration() - , m_client_buffer_integration(new QWaylandEglClientBufferIntegration()) + : m_client_buffer_integration(new QWaylandEglClientBufferIntegration()) { m_client_buffer_integration->initialize(display()); } diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h index 009a12f67..e711133c0 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h @@ -52,8 +52,7 @@ class QWaylandXCompositeEglPlatformIntegration : public QWaylandIntegration { public: QWaylandXCompositeEglPlatformIntegration() - : QWaylandIntegration() - , m_client_buffer_integration(new QWaylandXCompositeEGLClientBufferIntegration()) + : m_client_buffer_integration(new QWaylandXCompositeEGLClientBufferIntegration()) { m_client_buffer_integration->initialize(display()); } diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h index a8a70bdd9..32e286c52 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h @@ -53,8 +53,7 @@ class QWaylandXCompositeGlxPlatformIntegration : public QWaylandIntegration { public: QWaylandXCompositeGlxPlatformIntegration() - : QWaylandIntegration() - , m_client_buffer_integration(new QWaylandXCompositeGLXIntegration()) + : m_client_buffer_integration(new QWaylandXCompositeGLXIntegration()) { m_client_buffer_integration->initialize(display()); } diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp index fee812501..14074625a 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp @@ -55,12 +55,6 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { QWaylandIviShellIntegration::QWaylandIviShellIntegration() - : m_iviApplication(nullptr) - , m_iviController(nullptr) - , m_lastSurfaceId(0) - , m_surfaceNumber(0) - , m_useEnvSurfaceId(false) - , m_mutex(QMutex::Recursive) { } 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}; }; } diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp index 335aa852c..ec529b124 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp @@ -52,7 +52,6 @@ QWaylandIviSurface::QWaylandIviSurface(struct ::ivi_surface *ivi_surface, QWayla : QtWayland::ivi_surface(ivi_surface) , QWaylandShellSurface(window) , m_window(window) - , m_extendedWindow(nullptr) { createExtendedSurface(window); } @@ -63,7 +62,6 @@ QWaylandIviSurface::QWaylandIviSurface(struct ::ivi_surface *ivi_surface, QWayla , QWaylandShellSurface(window) , QtWayland::ivi_controller_surface(iviControllerSurface) , m_window(window) - , m_extendedWindow(nullptr) { createExtendedSurface(window); } diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h index 0a717b398..f24ecd37a 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h @@ -70,7 +70,7 @@ private: void ivi_controller_surface_visibility(int32_t visibility) override; QWaylandWindow *m_window; - QWaylandExtendedSurface *m_extendedWindow; + QWaylandExtendedSurface *m_extendedWindow = nullptr; }; } |