summaryrefslogtreecommitdiffstats
path: root/tests/auto/client/client/tst_client.cpp
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 /tests/auto/client/client/tst_client.cpp
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 'tests/auto/client/client/tst_client.cpp')
-rw-r--r--tests/auto/client/client/tst_client.cpp27
1 files changed, 9 insertions, 18 deletions
diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index eb99b2e2f..8ee52d736 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -48,14 +48,6 @@ class TestWindow : public QWindow
{
public:
TestWindow()
- : focusInEventCount(0)
- , focusOutEventCount(0)
- , keyPressEventCount(0)
- , keyReleaseEventCount(0)
- , mousePressEventCount(0)
- , mouseReleaseEventCount(0)
- , touchEventCount(0)
- , keyCode(0)
{
setSurfaceType(QSurface::RasterSurface);
setGeometry(0, 0, 32, 32);
@@ -103,15 +95,15 @@ public:
QPoint frameOffset() const { return QPoint(frameMargins().left(), frameMargins().top()); }
- int focusInEventCount;
- int focusOutEventCount;
- int keyPressEventCount;
- int keyReleaseEventCount;
- int mousePressEventCount;
- int mouseReleaseEventCount;
- int touchEventCount;
+ int focusInEventCount = 0;
+ int focusOutEventCount = 0;
+ int keyPressEventCount = 0;
+ int keyReleaseEventCount = 0;
+ int mousePressEventCount = 0;
+ int mouseReleaseEventCount = 0;
+ int touchEventCount = 0;
- uint keyCode;
+ uint keyCode = 0;
QPoint mousePressPos;
};
@@ -404,7 +396,6 @@ class DndWindow : public QWindow
public:
DndWindow(QWindow *parent = nullptr)
: QWindow(parent)
- , dragStarted(false)
{
QImage cursorImage(64,64,QImage::Format_ARGB32);
cursorImage.fill(Qt::blue);
@@ -412,7 +403,7 @@ public:
}
~DndWindow(){}
QPoint frameOffset() const { return QPoint(frameMargins().left(), frameMargins().top()); }
- bool dragStarted;
+ bool dragStarted = false;
protected:
void mousePressEvent(QMouseEvent *event) override