[ekiga] Engine: Dropped deprecated RefLister & LiveObject.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Engine: Dropped deprecated RefLister & LiveObject.
- Date: Thu, 12 Nov 2015 18:34:31 +0000 (UTC)
commit 197ea3aca0f232898287a5bd3a6e9ebfc3b75527
Author: Damien Sandras <dsandras seconix com>
Date: Sun Jun 21 16:53:56 2015 +0200
Engine: Dropped deprecated RefLister & LiveObject.
lib/Makefile.am | 2 -
lib/engine/components/opal/h323-call-manager.cpp | 2 +-
lib/engine/components/opal/sip-call-manager.cpp | 2 +-
lib/engine/framework/dynamic-object-store.h | 1 -
lib/engine/framework/live-object.h | 75 ---------
lib/engine/framework/reflister.h | 191 ----------------------
lib/engine/protocol/call-core.h | 7 +-
lib/engine/protocol/call-manager.h | 7 +-
8 files changed, 10 insertions(+), 277 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 896c57e..1846442 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -144,7 +144,6 @@ libekiga_la_SOURCES += \
engine/framework/null-deleter.h \
engine/framework/map-key-iterator.h \
engine/framework/map-key-const-iterator.h \
- engine/framework/reflister.h \
engine/framework/dynamic-object-store.h \
engine/framework/chain-of-responsibility.h \
engine/framework/device-def.h \
@@ -176,7 +175,6 @@ libekiga_la_SOURCES += \
engine/framework/ptr_array.h \
engine/framework/ptr_array_iterator.h \
engine/framework/ptr_array_const_iterator.h \
- engine/framework/live-object.h \
engine/framework/dynamic-object.h \
engine/framework/filterable.h \
engine/framework/scoped-connections.h
diff --git a/lib/engine/components/opal/h323-call-manager.cpp
b/lib/engine/components/opal/h323-call-manager.cpp
index 27c13ac..cb22b46 100644
--- a/lib/engine/components/opal/h323-call-manager.cpp
+++ b/lib/engine/components/opal/h323-call-manager.cpp
@@ -75,7 +75,7 @@ void Opal::H323::CallManager::pull_actions (Ekiga::Actor & actor,
const std::string & uri)
{
if (is_supported_uri (uri)) {
- add_action (actor, Ekiga::ActionPtr (new Ekiga::Action ("call", _("Call"), boost::bind
(&Opal::H323::CallManager::dial, this, uri))));
+ Ekiga::URIActionProvider::add_action (actor, Ekiga::ActionPtr (new Ekiga::Action ("call", _("Call"),
boost::bind (&Opal::H323::CallManager::dial, this, uri))));
}
}
diff --git a/lib/engine/components/opal/sip-call-manager.cpp b/lib/engine/components/opal/sip-call-manager.cpp
index b9e0f3d..c33010e 100644
--- a/lib/engine/components/opal/sip-call-manager.cpp
+++ b/lib/engine/components/opal/sip-call-manager.cpp
@@ -89,7 +89,7 @@ void Opal::Sip::CallManager::pull_actions (Ekiga::Actor & actor,
const std::string & uri)
{
if (is_supported_uri (uri))
- add_action (actor, Ekiga::ActionPtr (new Ekiga::Action ("call", _("Call"), boost::bind
(&Opal::CallManager::dial, this, uri))));
+ Ekiga::URIActionProvider::add_action (actor, Ekiga::ActionPtr (new Ekiga::Action ("call", _("Call"),
boost::bind (&Opal::CallManager::dial, this, uri))));
}
diff --git a/lib/engine/framework/dynamic-object-store.h b/lib/engine/framework/dynamic-object-store.h
index 5fedec1..0b49d1e 100644
--- a/lib/engine/framework/dynamic-object-store.h
+++ b/lib/engine/framework/dynamic-object-store.h
@@ -42,7 +42,6 @@
#include <boost/smart_ptr.hpp>
-#include "live-object.h"
#include "map-key-iterator.h"
#include "map-key-const-iterator.h"
#include "scoped-connections.h"
diff --git a/lib/engine/protocol/call-core.h b/lib/engine/protocol/call-core.h
index 10e0a21..648be15 100644
--- a/lib/engine/protocol/call-core.h
+++ b/lib/engine/protocol/call-core.h
@@ -39,7 +39,6 @@
#include "form-request.h"
#include "chain-of-responsibility.h"
#include "services.h"
-#include "reflister.h"
#include "dynamic-object-store.h"
#include "friend-or-foe/friend-or-foe.h"
#include "call.h"
@@ -119,8 +118,8 @@ namespace Ekiga
*/
void remove_manager (boost::shared_ptr<CallManager> manager);
- typedef typename RefLister<CallManager>::const_iterator const_iterator;
- typedef typename RefLister<CallManager>::iterator iterator;
+ typedef typename DynamicObjectStore<CallManager>::const_iterator const_iterator;
+ typedef typename DynamicObjectStore<CallManager>::iterator iterator;
/** Returns an iterator to the first Book of the collection
*/
@@ -204,7 +203,7 @@ namespace Ekiga
boost::weak_ptr<Ekiga::NotificationCore> notification_core;
DynamicObjectStore<Ekiga::Call> calls;
- RefLister<Ekiga::CallManager> managers;
+ DynamicObjectStore<Ekiga::CallManager> managers;
};
/**
diff --git a/lib/engine/protocol/call-manager.h b/lib/engine/protocol/call-manager.h
index e34d65a..460c23d 100644
--- a/lib/engine/protocol/call-manager.h
+++ b/lib/engine/protocol/call-manager.h
@@ -44,8 +44,9 @@
#include <boost/smart_ptr.hpp>
-#include "live-object.h"
#include "codec-description.h"
+#include "dynamic-object.h"
+#include "actor.h"
namespace Ekiga
{
@@ -55,7 +56,9 @@ namespace Ekiga
* @{
*/
- class CallManager : public Ekiga::LiveObject
+ class CallManager
+ : public Actor,
+ public DynamicObject<CallManager>
{
public:
class Interface
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]