Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

[enigma2.git] / include / connection.h

diff --git a/include/connection.h b/include/connection.h
index 8ca75cb90b76ac4965d3442949f7d77699d676dc..870fd85b73682a72c90f19137ea89c8c581c82a5 100644 (file)
--- a/include/connection.h
+++ b/include/connection.h
@@ -4,14 +4,12 @@
 #include <libsig_comp.h>
 #include <lib/base/object.h>
 
-class eConnection: public virtual iObject, public Connection
+class eConnection: public iObject, public Connection
 {
-       int ref;
+       DECLARE_REF(eConnection);
        ePtr<iObject> m_owner;
 public:
-DEFINE_REF(eConnection);
-public:
-       eConnection(iObject *owner, const Connection &conn): Connection(conn), ref(0), m_owner(owner) { };
+       eConnection(iObject *owner, const Connection &conn): Connection(conn), m_owner(owner) { };
        virtual ~eConnection() { disconnect(); }
 };