From 4322c9036767bc93822cc169568eb1385afa1b61 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 10 Dec 2016 01:58:58 +0100 Subject: [PATCH] set up dummy-session-connection to implement this scaffolding ...and as first step towards an UI-Session connection: actually include the Nexus and the CoreService in to ui-bus.cpp --- src/gui/ctrl/mutation-message.hpp | 2 +- src/gui/ui-bus.cpp | 3 +++ .../session/dummy-session-connection.cpp | 4 ++++ .../session/dummy-session-connection.hpp | 19 +++++++++++-------- wiki/thinkPad.ichthyo.mm | 10 ++++++++-- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/gui/ctrl/mutation-message.hpp b/src/gui/ctrl/mutation-message.hpp index da9901a98..e83b14a9c 100644 --- a/src/gui/ctrl/mutation-message.hpp +++ b/src/gui/ctrl/mutation-message.hpp @@ -95,7 +95,7 @@ namespace ctrl{ describe() const override { DIFF copy(diff_); // NOTE: we copy, since each iteration consumes. - return util::join (move(copy)); + return ::util::join (move(copy)); } public: diff --git a/src/gui/ui-bus.cpp b/src/gui/ui-bus.cpp index 6b8062a80..9c72bf4f0 100644 --- a/src/gui/ui-bus.cpp +++ b/src/gui/ui-bus.cpp @@ -23,6 +23,9 @@ #include "gui/ui-bus.hpp" +#include "gui/ctrl/nexus.hpp" +#include "gui/ctrl/core-service.hpp" +#include "lib/depend.hpp" namespace gui { ///////////////////////////////////////////////////////////////////////////////////TICKET #959 : scheduled for termination.... diff --git a/src/proc/mobject/session/dummy-session-connection.cpp b/src/proc/mobject/session/dummy-session-connection.cpp index a8025f884..d2fefe739 100644 --- a/src/proc/mobject/session/dummy-session-connection.cpp +++ b/src/proc/mobject/session/dummy-session-connection.cpp @@ -68,6 +68,10 @@ namespace session { } + /** storage for the Singleton accessor */ + lib::Depend DummySessionConnection::instance; + + /** * * @param id diff --git a/src/proc/mobject/session/dummy-session-connection.hpp b/src/proc/mobject/session/dummy-session-connection.hpp index 116da0c70..e91a21598 100644 --- a/src/proc/mobject/session/dummy-session-connection.hpp +++ b/src/proc/mobject/session/dummy-session-connection.hpp @@ -44,7 +44,7 @@ #define PROC_MOBJECT_SESSION_DUMMY_SESSION_CONNECTION_H #include "lib/error.hpp" -#include "lib/hash-value.h" +#include "lib/depend.hpp" //#include "lib/symbol.hpp" #include "lib/util.hpp" @@ -55,10 +55,7 @@ namespace proc { namespace mobject { namespace session { - class LifecycleAdvisor; - - using lib::HashVal; - using util::isnil; +//using util::isnil; using std::string; /** @@ -68,15 +65,21 @@ namespace session { * @see DummySessionConnection_test */ class DummySessionConnection + : boost::noncopyable { string nothing_; - public: DummySessionConnection(); + ~DummySessionConnection(); - ~DummySessionConnection ( ); + friend class lib::DependencyFactory; - // using default copy/assignment + public: + /** access point to set up the scaffolding. + * @internal this is a development helper and will be remoulded all the time. + */ + static lib::Depend instance; + /* == X interface for == */ diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index ac9b236ae..7a9ffcd9e 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -23,8 +23,14 @@ - - + + + + + + + +