1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix -Wreorder warning by using default member initializers

Browse Source 
Change-Id: I50f2928f1329fe45b4315baa33909b3227be1faa
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
This commit is contained in:
Johan Klokkhammer Helsing 2017-10-04 11:05:25 +02:00 committed by Johan Helsing
parent 5ba3b471b1
commit 58b30a6820
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/wayland/client/mockcompositor.cpp
View File

@ -264,8 +264,6 @@ namespace Impl {
Compositor::Compositor() Compositor::Compositor()
: m_display(wl_display_create()) : m_display(wl_display_create())
, m_startDragSeen(false)
, m_time(0)
{ {
wl_list_init(&m_outputResources); wl_list_init(&m_outputResources);

18
tests/auto/wayland/client/mockcompositor.h
View File

@ -88,7 +88,7 @@ public:
static void waitForStartDrag(void *data, const QList<QVariant> &parameters); static void waitForStartDrag(void *data, const QList<QVariant> &parameters);
public: public:
bool m_startDragSeen; bool m_startDragSeen = false;
private: private:
static void bindCompositor(wl_client *client, void *data, uint32_t version, uint32_t id); static void bindCompositor(wl_client *client, void *data, uint32_t version, uint32_t id);
@ -102,18 +102,18 @@ private:
QRect m_outputGeometry; QRect m_outputGeometry;
wl_display *m_display; wl_display *m_display = nullptr;
wl_event_loop *m_loop; wl_event_loop *m_loop = nullptr;
wl_shm *m_shm; wl_shm *m_shm = nullptr;
int m_fd; int m_fd = -1;
wl_list m_outputResources; wl_list m_outputResources;
uint32_t m_time; uint32_t m_time = 0;
QScopedPointer<Seat> m_seat; QScopedPointer<Seat> m_seat;
Pointer *m_pointer; Pointer *m_pointer = nullptr;
Keyboard *m_keyboard; Keyboard *m_keyboard = nullptr;
Touch *m_touch; Touch *m_touch = nullptr;
QScopedPointer<DataDeviceManager> m_data_device_manager; QScopedPointer<DataDeviceManager> m_data_device_manager;
QVector<Surface *> m_surfaces; QVector<Surface *> m_surfaces;
}; };