From c144d15e6530120b2016259ec42980759ae6d708 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Mon, 12 Dec 2016 03:16:29 +0100 Subject: [PATCH] add two placeholder functions for now ...soon to be replaced by the actual stuff, but right now I am only concerned with getting all the boilerplate straight --- src/include/session-command-facade.h | 14 ++++++-------- .../control/session-command-interface-proxy.hpp | 4 ++-- src/proc/control/session-command-service.cpp | 12 ++++++------ src/proc/control/session-command-service.hpp | 4 ++-- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/include/session-command-facade.h b/src/include/session-command-facade.h index 4a59268c5..5165f1278 100644 --- a/src/include/session-command-facade.h +++ b/src/include/session-command-facade.h @@ -67,13 +67,11 @@ namespace control { public: static lumiera::facade::Accessor facade; - /** push a user visible notification text */ - virtual void displayInfo (string const& text) =0; + /** @todo dummy placeholder, actual operation to be defined soon (12/16) */ + virtual void bla_TODO (string const& text) =0; - /** causes the GUI to shut down unconditionally - * @param cause user visible explanation of the - * reason causing this shutdown */ - virtual void triggerGuiShutdown (string const& cause) =0; + /** @todo dummy placeholder, actual operation to be defined soon (12/16) */ + virtual void blubb_TODO (string const& cause) =0; protected: @@ -92,8 +90,8 @@ extern "C" { #include "common/interface.h" LUMIERA_INTERFACE_DECLARE (lumieraorg_SessionCommand, 0, - LUMIERA_INTERFACE_SLOT (void, displayInfo, (const char*)), - LUMIERA_INTERFACE_SLOT (void, triggerGuiShutdown, (const char*)), + LUMIERA_INTERFACE_SLOT (void, bla_TODO, (const char*)), + LUMIERA_INTERFACE_SLOT (void, blubb_TODO, (const char*)), ); diff --git a/src/proc/control/session-command-interface-proxy.hpp b/src/proc/control/session-command-interface-proxy.hpp index 0c31aa6b7..502a88fc8 100644 --- a/src/proc/control/session-command-interface-proxy.hpp +++ b/src/proc/control/session-command-interface-proxy.hpp @@ -65,8 +65,8 @@ namespace facade { { //----Proxy-Implementation-of-SessionCommand-------- - void displayInfo (string const& text) override { _i_.displayInfo (cStr(text)); } - void triggerGuiShutdown (string const& cause) override { _i_.triggerGuiShutdown (cStr(cause)); } + void bla_TODO (string const& text) override { _i_.bla_TODO (cStr(text)); } + void blubb_TODO (string const& cause) override { _i_.blubb_TODO (cStr(cause)); } public: diff --git a/src/proc/control/session-command-service.cpp b/src/proc/control/session-command-service.cpp index 0906ce54b..39bc8d633 100644 --- a/src/proc/control/session-command-service.cpp +++ b/src/proc/control/session-command-service.cpp @@ -48,7 +48,7 @@ namespace control { void - SessionCommandService::displayInfo (string const& text) + SessionCommandService::bla_TODO (string const& text) { INFO (gui, "@Session: display '%s' as notification message.", cStr(text)); UNIMPLEMENTED ("do bla"); ////////////////////////TODO actually do something @@ -56,7 +56,7 @@ namespace control { void - SessionCommandService::triggerGuiShutdown (string const& cause) + SessionCommandService::blubb_TODO (string const& cause) { NOTICE (gui, "@Session: shutdown triggered with explanation '%s'....", cStr(cause)); UNIMPLEMENTED ("do blubb"); ////////////////////////TODO actually do something @@ -150,20 +150,20 @@ namespace control { , LUMIERA_INTERFACE_REF(lumieraorg_interfacedescriptor, 0, lumieraorg_SessionCommandFacade_descriptor) , NULL /* on open */ , NULL /* on close */ - , LUMIERA_INTERFACE_INLINE (displayInfo, + , LUMIERA_INTERFACE_INLINE (bla_TODO, void, (const char* text), { if (!_instance) lumiera_error_set(LUMIERA_ERROR_FACADE_LIFECYCLE, text); else - _instance->displayInfo(text); + _instance->bla_TODO(text); } ) - , LUMIERA_INTERFACE_INLINE (triggerGuiShutdown, + , LUMIERA_INTERFACE_INLINE (blubb_TODO, void, (const char* cause), { if (!_instance) lumiera_error_set(LUMIERA_ERROR_FACADE_LIFECYCLE, cause); else - _instance->triggerGuiShutdown(cause); + _instance->blubb_TODO(cause); } ) ); diff --git a/src/proc/control/session-command-service.hpp b/src/proc/control/session-command-service.hpp index fb53ed6c8..da20b9e76 100644 --- a/src/proc/control/session-command-service.hpp +++ b/src/proc/control/session-command-service.hpp @@ -69,8 +69,8 @@ namespace control { /* === Implementation of the Facade Interface === */ - void displayInfo (string const& text); - void triggerGuiShutdown (string const& cause); + void bla_TODO (string const& text) override; + void blubb_TODO (string const& cause) override; /* === Interface Lifecycle === */