summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandsurface_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/compositor_api/qwaylandsurface_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/compositor_api/qwaylandsurface_p.h')
-rw-r--r--src/compositor/compositor_api/qwaylandsurface_p.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h
index 3c43fc043..3dc9bf20e 100644
--- a/src/compositor/compositor_api/qwaylandsurface_p.h
+++ b/src/compositor/compositor_api/qwaylandsurface_p.h
@@ -140,13 +140,13 @@ protected:
QtWayland::ClientBuffer *getBuffer(struct ::wl_resource *buffer);
public: //member variables
- QWaylandCompositor *compositor;
- int refCount;
- QWaylandClient *client;
+ QWaylandCompositor *compositor = nullptr;
+ int refCount = 1;
+ QWaylandClient *client = nullptr;
QList<QWaylandView *> views;
QRegion damage;
QWaylandBufferRef bufferRef;
- QWaylandSurfaceRole *role;
+ QWaylandSurfaceRole *role = nullptr;
struct {
QWaylandBufferRef buffer;
@@ -167,15 +167,15 @@ public: //member variables
QRegion opaqueRegion;
QSize size;
- int bufferScale;
- bool isCursorSurface;
- bool destroyed;
- bool hasContent;
- bool isInitialized;
- Qt::ScreenOrientation contentOrientation;
+ int bufferScale = 1;
+ bool isCursorSurface = false;
+ bool destroyed = false;
+ bool hasContent = false;
+ bool isInitialized = false;
+ Qt::ScreenOrientation contentOrientation = Qt::PrimaryOrientation;
QWindow::Visibility visibility;
#if QT_CONFIG(im)
- QWaylandInputMethodControl *inputMethodControl;
+ QWaylandInputMethodControl *inputMethodControl = nullptr;
#endif
class Subsurface : public QtWaylandServer::wl_subsurface
@@ -198,7 +198,7 @@ public: //member variables
QPoint position;
};
- Subsurface *subsurface;
+ Subsurface *subsurface = nullptr;
#ifndef QT_NO_DEBUG
static QList<QWaylandSurfacePrivate *> uninitializedSurfaces;