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
This commit is contained in:
parent
a54990de7c
commit
4322c90367
5 changed files with 27 additions and 11 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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....
|
||||
|
|
|
|||
|
|
@ -68,6 +68,10 @@ namespace session {
|
|||
}
|
||||
|
||||
|
||||
/** storage for the Singleton accessor */
|
||||
lib::Depend<DummySessionConnection> DummySessionConnection::instance;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @param id
|
||||
|
|
|
|||
|
|
@ -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<DummySessionConnection> instance;
|
||||
|
||||
|
||||
/* == X interface for == */
|
||||
|
||||
|
|
|
|||
|
|
@ -23,8 +23,14 @@
|
|||
<icon BUILTIN="hourglass"/>
|
||||
<node CREATED="1477784813895" ID="ID_1343270939" MODIFIED="1481320738244" TEXT="Model durch UI-Bus ersetzen">
|
||||
<linktarget COLOR="#f9b709" DESTINATION="ID_1343270939" ENDARROW="Default" ENDINCLINATION="-30;-35;" ID="Arrow_ID_1867016690" SOURCE="ID_635303062" STARTARROW="None" STARTINCLINATION="-34;-43;"/>
|
||||
<node CREATED="1481320683706" ID="ID_1226263415" MODIFIED="1481320721872" TEXT="klären, wo der Bus aufgehängt wird">
|
||||
<icon BUILTIN="help"/>
|
||||
<node COLOR="#338800" CREATED="1481320683706" ID="ID_1226263415" MODIFIED="1481331062143" TEXT="klären, wo der Bus aufgehängt wird">
|
||||
<icon BUILTIN="button_ok"/>
|
||||
<node CREATED="1481331063782" ID="ID_1606852933" MODIFIED="1481331125690" TEXT="Lifecycle-Frontend"/>
|
||||
<node CREATED="1481331126846" ID="ID_1504578861" MODIFIED="1481331128530" TEXT="RAII"/>
|
||||
<node CREATED="1481331150275" ID="ID_814186655" MODIFIED="1481331157741" TEXT="als PImpl">
|
||||
<node CREATED="1481331159233" ID="ID_491966235" MODIFIED="1481331160685" TEXT="Nexus"/>
|
||||
<node CREATED="1481331161225" ID="ID_638534758" MODIFIED="1481331164044" TEXT="CoreService"/>
|
||||
</node>
|
||||
</node>
|
||||
<node CREATED="1481320693912" ID="ID_918908848" MODIFIED="1481320717736" TEXT="Lebenszyklus klären">
|
||||
<icon BUILTIN="help"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue