[ekiga] AddressBook: Allow multiple inheritance.



commit 8914766baef6a32430238cec01e7ba870fc57265
Author: Damien Sandras <dsandras seconix com>
Date:   Sun May 31 14:48:09 2015 +0200

    AddressBook: Allow multiple inheritance.

 lib/engine/addressbook/book.h    |    2 +-
 lib/engine/addressbook/contact.h |    2 +-
 lib/engine/addressbook/source.h  |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/lib/engine/addressbook/book.h b/lib/engine/addressbook/book.h
index 0eaaf4d..daa3611 100644
--- a/lib/engine/addressbook/book.h
+++ b/lib/engine/addressbook/book.h
@@ -43,7 +43,7 @@ namespace Ekiga {
   class Book;
   typedef boost::shared_ptr<Book> BookPtr;
 
-  class Book: public Actor
+  class Book: public virtual Actor
   {
 
   public:
diff --git a/lib/engine/addressbook/contact.h b/lib/engine/addressbook/contact.h
index 281aeb3..49ffaed 100644
--- a/lib/engine/addressbook/contact.h
+++ b/lib/engine/addressbook/contact.h
@@ -52,7 +52,7 @@ namespace Ekiga
  * @{
  */
 
-  class Contact: public Actor
+  class Contact: public virtual Actor
   {
   public:
 
diff --git a/lib/engine/addressbook/source.h b/lib/engine/addressbook/source.h
index aed6892..d857a33 100644
--- a/lib/engine/addressbook/source.h
+++ b/lib/engine/addressbook/source.h
@@ -44,8 +44,7 @@ namespace Ekiga {
   class Source;
   typedef boost::shared_ptr<Source> SourcePtr;
 
-  class Source:
-      public Actor
+  class Source: public virtual Actor
   {
   public:
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]