summaryrefslogtreecommitdiffstats
path: root/src/shared
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/shared
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/shared')
-rw-r--r--src/shared/qwaylandinputmethodeventbuilder.cpp10
-rw-r--r--src/shared/qwaylandinputmethodeventbuilder_p.h12
2 files changed, 6 insertions, 16 deletions
diff --git a/src/shared/qwaylandinputmethodeventbuilder.cpp b/src/shared/qwaylandinputmethodeventbuilder.cpp
index 6acf312ed..88056637d 100644
--- a/src/shared/qwaylandinputmethodeventbuilder.cpp
+++ b/src/shared/qwaylandinputmethodeventbuilder.cpp
@@ -50,16 +50,6 @@
QT_BEGIN_NAMESPACE
-QWaylandInputMethodEventBuilder::QWaylandInputMethodEventBuilder()
- : m_anchor(0)
- , m_cursor(0)
- , m_deleteBefore(0)
- , m_deleteAfter(0)
- , m_preeditCursor(0)
- , m_preeditStyles()
-{
-}
-
QWaylandInputMethodEventBuilder::~QWaylandInputMethodEventBuilder()
{
}
diff --git a/src/shared/qwaylandinputmethodeventbuilder_p.h b/src/shared/qwaylandinputmethodeventbuilder_p.h
index 3912afc04..a234cf44b 100644
--- a/src/shared/qwaylandinputmethodeventbuilder_p.h
+++ b/src/shared/qwaylandinputmethodeventbuilder_p.h
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
class QWaylandInputMethodEventBuilder
{
public:
- QWaylandInputMethodEventBuilder();
+ QWaylandInputMethodEventBuilder() = default;
~QWaylandInputMethodEventBuilder();
void reset();
@@ -66,12 +66,12 @@ public:
private:
QPair<int, int> replacementForDeleteSurrounding();
- int32_t m_anchor;
- int32_t m_cursor;
- uint32_t m_deleteBefore;
- uint32_t m_deleteAfter;
+ int32_t m_anchor = 0;
+ int32_t m_cursor = 0;
+ uint32_t m_deleteBefore = 0;
+ uint32_t m_deleteAfter = 0;
- int32_t m_preeditCursor;
+ int32_t m_preeditCursor = 0;
QList<QInputMethodEvent::Attribute> m_preeditStyles;
};