From c0ddd658bb3e9035eb701c60ea1c82eb6b53114c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 12 Sep 2016 17:19:35 +0900 Subject: Initialize Room::Private more carefully See https://marcmutz.wordpress.com/translated-articles/pimp-my-pimpl- %E2%80%94-reloaded --- room.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/room.cpp b/room.cpp index 161f5385..6f78b6c2 100644 --- a/room.cpp +++ b/room.cpp @@ -47,7 +47,10 @@ class Room::Private /** Map of user names to users. User names potentially duplicate, hence a multi-hashmap. */ typedef QMultiHash members_map_t; - Private(Room* parent): q(parent) {} + Private(Connection* c, const QString& id_) + : q(nullptr), connection(c), id(id_), joinState(JoinState::Join) + , roomMessagesJob(nullptr) + { } Room* q; @@ -96,12 +99,11 @@ class Room::Private }; Room::Room(Connection* connection, QString id) - : QObject(connection), d(new Private(this)) + : QObject(connection), d(new Private(connection, id)) { - d->id = id; - d->connection = connection; - d->joinState = JoinState::Join; - d->roomMessagesJob = nullptr; + // See "Accessing the Public Class" section in + // https://marcmutz.wordpress.com/translated-articles/pimp-my-pimpl-%E2%80%94-reloaded/ + d->q = this; qDebug() << "New Room:" << id; //connection->getMembers(this); // I don't think we need this anymore in r0.0.1 -- cgit v1.2.3