summaryrefslogtreecommitdiffstats
path: root/src/compositor/extensions/qwaylandwlshellintegration_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/qwaylandwlshellintegration_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/qwaylandwlshellintegration_p.h')
-rw-r--r--src/compositor/extensions/qwaylandwlshellintegration_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/extensions/qwaylandwlshellintegration_p.h b/src/compositor/extensions/qwaylandwlshellintegration_p.h
index 9a2e5a3a2..7b9569122 100644
--- a/src/compositor/extensions/qwaylandwlshellintegration_p.h
+++ b/src/compositor/extensions/qwaylandwlshellintegration_p.h
@@ -94,7 +94,7 @@ private:
QWaylandQuickShellSurfaceItem *m_item;
QPointer<QWaylandWlShellSurface> m_shellSurface;
- GrabberState grabberState;
+ GrabberState grabberState = GrabberState::Default;
struct {
QWaylandSeat *seat;
QPointF initialOffset;
@@ -108,7 +108,7 @@ private:
bool initialized;
} resizeState;
- bool isPopup;
+ bool isPopup = false;
enum class State {
Windowed,
@@ -116,8 +116,8 @@ private:
FullScreen
};
- State currentState;
- State nextState;
+ State currentState = State::Windowed;
+ State nextState = State::Windowed;
QPointF normalPosition;
QPointF finalPosition;
};