summaryrefslogtreecommitdiffstats
path: root/src/compositor/extensions/qwaylandxdgshellv6_p.h
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-02-27 11:32:15 +0100
committerJohan Helsing <johan.helsing@qt.io>2018-02-27 17:03:41 +0000
commitc4bd9198b4a0fac809903dd2c09276c2c3c1b22e (patch)
tree83325fe11d258c922ede480e0ad3de3df45032fa /src/compositor/extensions/qwaylandxdgshellv6_p.h
parent72999738489b5251d025c954a77c93e8e1fdfd9d (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/qwaylandxdgshellv6_p.h')
-rw-r--r--src/compositor/extensions/qwaylandxdgshellv6_p.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshellv6_p.h b/src/compositor/extensions/qwaylandxdgshellv6_p.h
index 98bcb70f7..191a936f9 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6_p.h
+++ b/src/compositor/extensions/qwaylandxdgshellv6_p.h
@@ -60,9 +60,9 @@ QT_BEGIN_NAMESPACE
struct Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPositionerV6Data {
QSize size;
QRect anchorRect;
- Qt::Edges anchorEdges;
- Qt::Edges gravityEdges;
- uint constraintAdjustments;
+ Qt::Edges anchorEdges = 0;
+ Qt::Edges gravityEdges = 0;
+ uint constraintAdjustments = ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_NONE;
QPoint offset;
QWaylandXdgPositionerV6Data();
bool isComplete() const;
@@ -112,15 +112,15 @@ public:
void updateFallbackWindowGeometry();
private:
- QWaylandXdgShellV6 *m_xdgShell;
- QWaylandSurface *m_surface;
+ QWaylandXdgShellV6 *m_xdgShell = nullptr;
+ QWaylandSurface *m_surface = nullptr;
- QWaylandXdgToplevelV6 *m_toplevel;
- QWaylandXdgPopupV6 *m_popup;
+ QWaylandXdgToplevelV6 *m_toplevel = nullptr;
+ QWaylandXdgPopupV6 *m_popup = nullptr;
QRect m_windowGeometry;
- bool m_unsetWindowGeometry;
+ bool m_unsetWindowGeometry = true;
QMargins m_windowMargins;
- Qt::WindowType m_windowType;
+ Qt::WindowType m_windowType = Qt::WindowType::Window;
void zxdg_surface_v6_destroy_resource(Resource *resource) override;
void zxdg_surface_v6_destroy(Resource *resource) override;
@@ -136,8 +136,8 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgToplevelV6Private : public QObjectP
public:
struct ConfigureEvent {
QVector<QWaylandXdgToplevelV6::State> states;
- QSize size;
- uint serial;
+ QSize size = {0, 0};
+ uint serial = 0;
};
QWaylandXdgToplevelV6Private(QWaylandXdgSurfaceV6 *xdgSurface, const QWaylandResource& resource);
@@ -169,7 +169,7 @@ protected:
public:
QWaylandXdgSurfaceV6 *m_xdgSurface;
- QWaylandXdgToplevelV6 *m_parentToplevel;
+ QWaylandXdgToplevelV6 *m_parentToplevel = nullptr;
QList<ConfigureEvent> m_pendingConfigures;
ConfigureEvent m_lastAckedConfigure;
QString m_title;