From a035be66bd381e32034b68be12a872c07be5db68 Mon Sep 17 00:00:00 2001 From: TuxSH Date: Mon, 5 Nov 2018 12:01:05 +0100 Subject: [PATCH] Rename initialize for client/server/parent --- mesosphere/include/mesosphere/interfaces/IClient.hpp | 2 +- .../include/mesosphere/interfaces/IClientServerParent.hpp | 6 +++--- mesosphere/include/mesosphere/interfaces/IServer.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mesosphere/include/mesosphere/interfaces/IClient.hpp b/mesosphere/include/mesosphere/interfaces/IClient.hpp index ed737f0cb..28a165220 100644 --- a/mesosphere/include/mesosphere/interfaces/IClient.hpp +++ b/mesosphere/include/mesosphere/interfaces/IClient.hpp @@ -20,7 +20,7 @@ class IClient { } protected: - void Initialize(SharedPtr parent) + void SetParent(SharedPtr parent) { this->parent = std::move(parent); } diff --git a/mesosphere/include/mesosphere/interfaces/IClientServerParent.hpp b/mesosphere/include/mesosphere/interfaces/IClientServerParent.hpp index b82feb716..cb877414c 100644 --- a/mesosphere/include/mesosphere/interfaces/IClientServerParent.hpp +++ b/mesosphere/include/mesosphere/interfaces/IClientServerParent.hpp @@ -13,11 +13,11 @@ class IClientServerParent { using ServerType = Server; protected: - void Initialize() + void SetClientServerParent() { Parent par = (Parent *)this; - client.Initialize(par); - server.Initialize(par); + client.SetParent(par); + server.SetParent(par); } ClientType client{}; diff --git a/mesosphere/include/mesosphere/interfaces/IServer.hpp b/mesosphere/include/mesosphere/interfaces/IServer.hpp index 5a81b0da8..326f718cf 100644 --- a/mesosphere/include/mesosphere/interfaces/IServer.hpp +++ b/mesosphere/include/mesosphere/interfaces/IServer.hpp @@ -20,7 +20,7 @@ class IServer { } protected: - void Initialize(SharedPtr parent) + void SetParent(SharedPtr parent) { this->parent = std::move(parent); this->client = &this->parent->client;