[ekiga/ds-gtk-application] Contact: Moved Actor inheritance to the parent.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/ds-gtk-application] Contact: Moved Actor inheritance to the parent.
- Date: Mon, 15 Sep 2014 18:02:13 +0000 (UTC)
commit 493f24c92782812070f750279f2d294852a23b90
Author: Damien Sandras <dsandras seconix com>
Date: Mon Sep 15 20:01:34 2014 +0200
Contact: Moved Actor inheritance to the parent.
lib/engine/addressbook/contact.h | 4 +++-
.../components/call-history/history-contact.h | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/lib/engine/addressbook/contact.h b/lib/engine/addressbook/contact.h
index d0c1ffa..033b928 100644
--- a/lib/engine/addressbook/contact.h
+++ b/lib/engine/addressbook/contact.h
@@ -44,6 +44,7 @@
#include <boost/smart_ptr.hpp>
#include "live-object.h"
+#include "actor.h"
namespace Ekiga
{
@@ -54,7 +55,8 @@ namespace Ekiga
*/
class Contact:
- public virtual LiveObject
+ public virtual LiveObject,
+ public Ekiga::Actor
{
public:
diff --git a/lib/engine/components/call-history/history-contact.h
b/lib/engine/components/call-history/history-contact.h
index b395d37..c4dffaa 100644
--- a/lib/engine/components/call-history/history-contact.h
+++ b/lib/engine/components/call-history/history-contact.h
@@ -41,7 +41,6 @@
#include <boost/smart_ptr.hpp>
#include "services.h"
-#include "actor.h"
#include "contact-core.h"
namespace History
@@ -62,7 +61,6 @@ namespace History
class Contact:
public Ekiga::Contact,
- public Ekiga::Actor,
public boost::signals2::trackable
{
public:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]