after DECLARE_REF now all is private.. not public

dont export AddRef, Release, ptrref and grabRef to python
some cleanups

35 files changed, 100 insertions, 109 deletions

diff --git a/include/connection.h b/include/connection.h
index a6fc4b54..870fd85b 100644
--- a/include/connection.h
+++ b/include/connection.h
@@ -6,8 +6,7 @@
 
 class eConnection: public iObject, public Connection
 {
-DECLARE_REF(eConnection);
-private:
+	DECLARE_REF(eConnection);
 	ePtr<iObject> m_owner;
 public:
 	eConnection(iObject *owner, const Connection &conn): Connection(conn), m_owner(owner) { };
diff --git a/lib/actions/action.h b/lib/actions/action.h
index 9628a69a..cbf5370a 100644
--- a/lib/actions/action.h
+++ b/lib/actions/action.h
@@ -16,7 +16,7 @@ class eWidget;
 SWIG_IGNORE(eActionMap);
 class eActionMap: public iObject
 {
-DECLARE_REF(eActionMap);
+	DECLARE_REF(eActionMap);
 #ifdef SWIG
 	eActionMap();
 	~eActionMap();
diff --git a/lib/base/object.h b/lib/base/object.h
index 1723a885..f0e0e9a5 100644
--- a/lib/base/object.h
+++ b/lib/base/object.h
@@ -18,9 +18,15 @@ private:
 	void operator=(const iObject &);
 protected:
 	virtual ~iObject() { }
+#ifdef SWIG
+	virtual void AddRef()=0;
+	virtual void Release()=0;
+#endif
 public:
+#ifndef SWIG
 	virtual void AddRef()=0;
 	virtual void Release()=0;
+#endif
 };
 
 #ifndef SWIG
@@ -43,10 +49,10 @@ public:
 	#if defined(OBJECT_DEBUG)
 		extern int object_total_remaining;
 		#define DECLARE_REF(x) 			\
-			private:oRefCount ref; 	\
-					eSingleLock ref_lock; \
 			public: void AddRef(); 		\
-					void Release();
+					void Release();		\
+			private:oRefCount ref; 		\
+					eSingleLock ref_lock;
 		#define DEFINE_REF(c) \
 			void c::AddRef() \
 			{ \
@@ -68,9 +74,9 @@ public:
 			}
 	#elif defined(__mips__)
 		#define DECLARE_REF(x) 			\
-			private: oRefCount ref; 	\
 			public: void AddRef(); 		\
-					void Release();
+					void Release();		\
+			private: oRefCount ref; 
 		#define DEFINE_REF(c) \
 			void c::AddRef() \
 			{ \
@@ -108,9 +114,9 @@ public:
 			}
 	#elif defined(__ppc__) || defined(__powerpc__)
 		#define DECLARE_REF(x) 			\
-			private: oRefCount ref; 	\
 			public: void AddRef(); 		\
-					void Release();
+					void Release();		\
+			private: oRefCount ref;
 		#define DEFINE_REF(c) \
 			void c::AddRef() \
 			{ \
@@ -142,9 +148,9 @@ public:
 			}
 	#elif defined(__i386__) || defined(__x86_64__)
 		#define DECLARE_REF(x) 			\
-			private: oRefCount ref; 	\
 			public: void AddRef(); 		\
-					void Release();
+					void Release();		\
+			private: oRefCount ref;
 		#define DEFINE_REF(c) \
 			void c::AddRef() \
 			{ \
@@ -165,10 +171,10 @@ public:
 	#else
 		#warning use non optimized implementation of refcounting.
 		#define DECLARE_REF(x) 			\
-			private:oRefCount ref; 	\
-					eSingleLock ref_lock; \
 			public: void AddRef(); 		\
-					void Release();
+					void Release();		\
+			private:oRefCount ref; 	\
+					eSingleLock ref_lock;
 		#define DEFINE_REF(c) \
 			void c::AddRef() \
 			{ \
@@ -190,9 +196,6 @@ public:
 		private: \
 			void AddRef(); \
 			void Release();
-	class Object
-	{
-	};
 #endif  // SWIG
 
 #endif  // __base_object_h
diff --git a/lib/base/smartptr.h b/lib/base/smartptr.h
index 6c3dbc2f..782ff48e 100644
--- a/lib/base/smartptr.h
+++ b/lib/base/smartptr.h
@@ -54,8 +54,10 @@ public:
 			ptr->Release();
 	}
 	
+#ifndef SWIG
 	T* grabRef() { if (!ptr) return 0; ptr->AddRef(); return ptr; }
 	T* &ptrref() { assert(!ptr); return ptr; }
+#endif
 	T* operator->() const { ptrAssert(ptr); return ptr; }
 	operator T*() const { return this->ptr; }
 	
@@ -131,8 +133,10 @@ public:
 		}
 	}
 	
+#ifndef SWIG
 	T* grabRef() { if (!ptr) return 0; ptr->AddRef(); ptr->AddUse(); return ptr; }
 	T* &ptrref() { assert(!ptr); return ptr; }
+#endif
 	T* operator->() const { ptrAssert(ptr); return ptr; }
 	operator T*() const { return this->ptr; }
 };
diff --git a/lib/components/scan.h b/lib/components/scan.h
index b5acf91a..3d8984e1 100644
--- a/lib/components/scan.h
+++ b/lib/components/scan.h
@@ -8,8 +8,7 @@ class eDVBScan;
 
 class eComponentScan: public Object, public iObject
 {
-DECLARE_REF(eComponentScan);
-private:
+	DECLARE_REF(eComponentScan);
 #ifndef SWIG
 	void scanEvent(int event);
 	ePtr<eConnection> m_scan_event_connection;
diff --git a/lib/dvb/db.h b/lib/dvb/db.h
index 0947b345..512f81e4 100644
--- a/lib/dvb/db.h
+++ b/lib/dvb/db.h
@@ -10,8 +10,8 @@ class ServiceDescriptionSection;
 
 class eDVBDB: public iDVBChannelList
 {
+	DECLARE_REF(eDVBDB);
 	static eDVBDB *instance;
-DECLARE_REF(eDVBDB);
 	friend class eDVBDBQuery;
 	friend class eDVBDBBouquetQuery;
 	friend class eDVBDBSatellitesQuery;
@@ -75,7 +75,7 @@ public:
 	// we have to add a possibility to invalidate here.
 class eDVBDBQueryBase: public iDVBChannelListQuery
 {
-DECLARE_REF(eDVBDBQueryBase);
+	DECLARE_REF(eDVBDBQueryBase);
 protected:
 	ePtr<eDVBDB> m_db;
 	ePtr<eDVBChannelQuery> m_query;
diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
index 409a4421..7dfe3834 100644
--- a/lib/dvb/decoder.h
+++ b/lib/dvb/decoder.h
@@ -8,7 +8,7 @@ class eSocketNotifier;
 
 class eDVBAudio: public iObject
 {
-DECLARE_REF(eDVBAudio);
+	DECLARE_REF(eDVBAudio);
 private:
 	ePtr<eDVBDemux> m_demux;
 	int m_fd, m_fd_demux, m_dev, m_is_freezed;
@@ -36,7 +36,7 @@ public:
 
 class eDVBVideo: public iObject, public Object
 {
-DECLARE_REF(eDVBVideo);
+	DECLARE_REF(eDVBVideo);
 private:
 	ePtr<eDVBDemux> m_demux;
 	int m_fd, m_fd_demux, m_dev;
@@ -71,7 +71,7 @@ public:
 
 class eDVBPCR: public iObject
 {
-DECLARE_REF(eDVBPCR);
+	DECLARE_REF(eDVBPCR);
 private:
 	ePtr<eDVBDemux> m_demux;
 	int m_fd_demux;
@@ -89,7 +89,7 @@ public:
 
 class eDVBTText: public iObject
 {
-DECLARE_REF(eDVBTText);
+	DECLARE_REF(eDVBTText);
 private:
 	ePtr<eDVBDemux> m_demux;
 	int m_fd_demux;
@@ -102,10 +102,11 @@ public:
 
 class eTSMPEGDecoder: public Object, public iTSMPEGDecoder
 {
+	DECLARE_REF(eTSMPEGDecoder);
+private:
 	static int m_pcm_delay;
 	static int m_ac3_delay;
 	static int m_audio_channel;
-DECLARE_REF(eTSMPEGDecoder);
 	std::string m_radio_pic;
 	ePtr<eDVBDemux> m_demux;
 	ePtr<eDVBAudio> m_audio;
diff --git a/lib/dvb/demux.h b/lib/dvb/demux.h
index e3759331..3541974e 100644
--- a/lib/dvb/demux.h
+++ b/lib/dvb/demux.h
@@ -47,7 +47,6 @@ private:
 class eDVBSectionReader: public iDVBSectionReader, public Object
 {
 	DECLARE_REF(eDVBSectionReader);
-private:
 	int fd;
 	Signal1<void, const __u8*> read;
 	ePtr<eDVBDemux> demux;
@@ -67,7 +66,6 @@ public:
 class eDVBPESReader: public iDVBPESReader, public Object
 {
 	DECLARE_REF(eDVBPESReader);
-private:
 	int m_fd;
 	Signal2<void, const __u8*, int> m_read;
 	ePtr<eDVBDemux> m_demux;
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index f5ca483e..23a9d5a9 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -320,10 +320,11 @@ RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
 		if (!i->m_inuse && i->m_frontend->getSlotID() == slot_index)
 		{
 			// check if another slot linked to this is in use
-			eDVBRegisteredFrontend *satpos_depends_to_fe =
-				(eDVBRegisteredFrontend*) i->m_frontend->m_data[eDVBFrontend::SATPOS_DEPENDS_PTR];
-			if ( (long)satpos_depends_to_fe != -1 )
+			long tmp;
+			i->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp);
+			if ( tmp != -1 )
 			{
+				eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend *)tmp;
 				if (satpos_depends_to_fe->m_inuse)
 				{
 					eDebug("another satpos depending frontend is in use.. so allocateFrontendByIndex not possible!");
@@ -333,29 +334,29 @@ RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
 			}
 			else // check linked tuners
 			{
-				eDVBRegisteredFrontend *next =
-					(eDVBRegisteredFrontend *) i->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR];
-				while ( (long)next != -1 )
+				i->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, tmp);
+				while ( tmp != -1 )
 				{
+					eDVBRegisteredFrontend *next = (eDVBRegisteredFrontend *) tmp;
 					if (next->m_inuse)
 					{
 						eDebug("another linked frontend is in use.. so allocateFrontendByIndex not possible!");
 						err = errAllSourcesBusy;
 						goto alloc_fe_by_id_not_possible;
 					}
-					next = (eDVBRegisteredFrontend *)next->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR];
+					next->m_frontend->getData(eDVBFrontend::LINKED_NEXT_PTR, tmp);
 				}
-				eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)
-					i->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR];
-				while ( (long)prev != -1 )
+				i->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
+				while ( tmp != -1 )
 				{
+					eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *) tmp;
 					if (prev->m_inuse)
 					{
 						eDebug("another linked frontend is in use.. so allocateFrontendByIndex not possible!");
 						err = errAllSourcesBusy;
 						goto alloc_fe_by_id_not_possible;
 					}
-					prev = (eDVBRegisteredFrontend *)prev->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR];
+					prev->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
 				}
 			}
 			fe = new eDVBAllocatedFrontend(i);
diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index d2148bc9..2fca347d 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -23,13 +23,13 @@ class eDVBRegisteredFrontend: public iObject, public Object
 {
 	DECLARE_REF(eDVBRegisteredFrontend);
 	eTimer *disable;
-	Signal0<void> stateChanged;
 	void closeFrontend()
 	{
 		if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
 			disable->start(60000, true);  // retry close in 60secs
 	}
 public:
+	Signal0<void> stateChanged;
 	eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap)
 		:disable(new eTimer(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0)
 	{
@@ -62,7 +62,7 @@ public:
 
 struct eDVBRegisteredDemux
 {
-DECLARE_REF(eDVBRegisteredDemux);
+	DECLARE_REF(eDVBRegisteredDemux);
 public:
 	iDVBAdapter *m_adapter;
 	ePtr<eDVBDemux> m_demux;
@@ -72,7 +72,7 @@ public:
 
 class eDVBAllocatedFrontend
 {
-DECLARE_REF(eDVBAllocatedFrontend);
+	DECLARE_REF(eDVBAllocatedFrontend);
 public:
 	
 	eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe);
@@ -87,7 +87,7 @@ private:
 
 class eDVBAllocatedDemux
 {
-DECLARE_REF(eDVBAllocatedDemux);
+	DECLARE_REF(eDVBAllocatedDemux);
 public:
 	
 	eDVBAllocatedDemux(eDVBRegisteredDemux *demux);
@@ -112,7 +112,7 @@ public:
 
 class eDVBAdapterLinux: public iDVBAdapter
 {
-DECLARE_REF(eDVBAdapterLinux);
+	DECLARE_REF(eDVBAdapterLinux);
 public:
 	eDVBAdapterLinux(int nr);
 
diff --git a/lib/dvb/dvbtime.h b/lib/dvb/dvbtime.h
index debbbff9..ffcfaa41 100644
--- a/lib/dvb/dvbtime.h
+++ b/lib/dvb/dvbtime.h
@@ -46,6 +46,7 @@ public:
 
 class eDVBLocalTimeHandler: public Object
 {
+	DECLARE_REF(eDVBLocalTimeHandler);
 	struct channel_data
 	{
 		TDT *tdt;
@@ -54,7 +55,6 @@ class eDVBLocalTimeHandler: public Object
 		int m_prevChannelState;
 	};
 	friend class TDT;
-	DECLARE_REF(eDVBLocalTimeHandler)
 	std::map<iDVBChannel*, channel_data> m_knownChannels;
 	std::map<eDVBChannelID,int> m_timeOffsetMap;
 	ePtr<eConnection> m_chanAddedConn;
diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index 98d53b48..5dc84ec6 100644
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -6,8 +6,7 @@
 
 class eGTable: public iObject, public Object
 {
-DECLARE_REF(eGTable);
-private:
+	DECLARE_REF(eGTable);
 	ePtr<iDVBSectionReader> m_reader;
 	eDVBTableSpec m_table;
 	
diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index ac681bbe..bbfd174d 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -41,6 +41,25 @@ class eSecCommandList;
 
 class eDVBFrontend: public iDVBFrontend, public Object
 {
+public:
+	enum {
+		CSW,                  // state of the committed switch
+		UCSW,                 // state of the uncommitted switch
+		TONEBURST,            // current state of toneburst switch
+		NEW_ROTOR_CMD,        // prev sent rotor cmd
+		NEW_ROTOR_POS,        // new rotor position (not validated)
+		ROTOR_CMD,            // completed rotor cmd (finalized)
+		ROTOR_POS,            // current rotor position
+		LINKED_PREV_PTR,      // prev double linked list (for linked FEs)
+		LINKED_NEXT_PTR,      // next double linked list (for linked FEs)
+		SATPOS_DEPENDS_PTR,   // pointer to FE with configured rotor (with twin/quattro lnb)
+		FREQ_OFFSET,          // current frequency offset
+		CUR_VOLTAGE,          // current voltage
+		CUR_TONE,             // current continuous tone
+		NUM_DATA_ENTRIES
+	};
+	Signal1<void,iDVBFrontend*> m_stateChanged;
+private:
 	DECLARE_REF(eDVBFrontend);
 	bool m_enabled;
 	int m_type;
@@ -54,10 +73,8 @@ class eDVBFrontend: public iDVBFrontend, public Object
 	int m_secfd;
 	char m_sec_filename[128];
 #endif
-
 	FRONTENDPARAMETERS parm;
 	int m_state;
-	Signal1<void,iDVBFrontend*> m_stateChanged;
 	ePtr<iDVBSatelliteEquipmentControl> m_sec;
 	eSocketNotifier *m_sn;
 	int m_tuning;
@@ -66,23 +83,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
 	eSecCommandList m_sec_sequence;
 
-	enum {
-		CSW,                  // state of the committed switch
-		UCSW,                 // state of the uncommitted switch
-		TONEBURST,            // current state of toneburst switch
-		NEW_ROTOR_CMD,        // prev sent rotor cmd
-		NEW_ROTOR_POS,        // new rotor position (not validated)
-		ROTOR_CMD,            // completed rotor cmd (finalized)
-		ROTOR_POS,            // current rotor position
-		LINKED_PREV_PTR,      // prev double linked list (for linked FEs)
-		LINKED_NEXT_PTR,      // next double linked list (for linked FEs)
-		SATPOS_DEPENDS_PTR,   // pointer to FE with configured rotor (with twin/quattro lnb)
-		FREQ_OFFSET,          // current frequency offset
-		CUR_VOLTAGE,          // current voltage
-		CUR_TONE,             // current continuous tone
-		NUM_DATA_ENTRIES
-	};
-
 	long m_data[NUM_DATA_ENTRIES];
 
 	int m_idleInputpower[2];  // 13V .. 18V
@@ -95,7 +95,6 @@ class eDVBFrontend: public iDVBFrontend, public Object
 	void timeout();
 	void tuneLoop();  // called by m_tuneTimer
 	void setFrontend();
-	int readInputpower();
 	bool setSecSequencePos(int steps);
 	void setRotorData(int pos, int cmd);
 	static int PriorityOrder;
@@ -103,6 +102,7 @@ public:
 	eDVBFrontend(int adap, int fe, int &ok);	
 	virtual ~eDVBFrontend();
 
+	int readInputpower();
 	RESULT getFrontendType(int &type);
 	RESULT tune(const iDVBFrontendParameters &where);
 	RESULT prepare_sat(const eDVBFrontendParametersSatellite &, unsigned int timeout);
diff --git a/lib/dvb/list.h b/lib/dvb/list.h
index 80ad20e8..80faca1f 100644
--- a/lib/dvb/list.h
+++ b/lib/dvb/list.h
@@ -4,7 +4,6 @@
 class eDVBTransponderList: iDVBChannelList
 {
 	DECLARE_REF(eDVBTransponderList);
-private:
 	std::map<eDVBChannelID, ePtr<iDVBFrontendParameters> > channels;
 public:
 	virtual RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm)=0;
diff --git a/lib/dvb/radiotext.h b/lib/dvb/radiotext.h
index 8c354ff1..634352f7 100644
--- a/lib/dvb/radiotext.h
+++ b/lib/dvb/radiotext.h
@@ -15,11 +15,11 @@ class eDVBRdsDecoder: public iObject, public ePESParser, public Object
 	unsigned char qdar[60*1024]; //60 kB for holding Rass qdar archive
 	unsigned short crc16, crc;
 	long part, parts, partcnt;
-	enum { RadioTextChanged, RtpTextChanged, RassInteractivePicMaskChanged, RecvRassSlidePic };
 	unsigned char rass_picture_mask[5];  // 40 bits... (10 * 4 pictures)
 	void addToPictureMask(int id);
 	void removeFromPictureMask(int id);
 public:
+	enum { RadioTextChanged, RtpTextChanged, RassInteractivePicMaskChanged, RecvRassSlidePic };
 	eDVBRdsDecoder(iDVBDemux *demux);
 	~eDVBRdsDecoder();
 	int start(int pid);
diff --git a/lib/dvb/scan.h b/lib/dvb/scan.h
index 6dcbe707..68e21a5d 100644
--- a/lib/dvb/scan.h
+++ b/lib/dvb/scan.h
@@ -11,8 +11,7 @@
 
 class eDVBScan: public Object, public iObject
 {
-DECLARE_REF(eDVBScan);
-private:
+	DECLARE_REF(eDVBScan);
 		/* chid helper functions: */
 		
 		/* heuristically determine if onid/tsid is valid */
diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 2241e00e..18935b97 100644
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -243,6 +243,7 @@ class eDVBRegisteredFrontend;
 
 class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl
 {
+	DECLARE_REF(eDVBSatelliteEquipmentControl);
 public:
 	enum {
 		DELAY_AFTER_CONT_TONE=0,  // delay after continuous tone change
@@ -280,7 +281,6 @@ private:
 public:
 #ifndef SWIG
 	eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBRegisteredFrontend> &avail_frontends);
-	DECLARE_REF(eDVBSatelliteEquipmentControl);
 	RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int tunetimeout);
 	int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *, int frontend_id);
 	bool currentLNBValid() { return m_lnbidx > -1 && m_lnbidx < (int)(sizeof(m_lnbs) / sizeof(eDVBSatelliteLNBParameters)); }
diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h
index 603fadfd..8fa313e2 100644
--- a/lib/dvb_ci/dvbci.h
+++ b/lib/dvb_ci/dvbci.h
@@ -41,8 +41,7 @@ enum data_source
 class eDVBCISlot: public iObject, public Object
 {
 	friend class eDVBCIInterfaces;
-DECLARE_REF(eDVBCISlot);
-private:
+	DECLARE_REF(eDVBCISlot);
 	int slotid;
 	int fd;
 	eSocketNotifier *notifier;
@@ -112,9 +111,8 @@ typedef std::list<CIPmtHandler> PMTHandlerList;
 
 class eDVBCIInterfaces
 {
-DECLARE_REF(eDVBCIInterfaces);
+	DECLARE_REF(eDVBCIInterfaces);
 	static eDVBCIInterfaces *instance;
-private:
 	eSmartPtrList<eDVBCISlot> m_slots;
 	eDVBCISlot *getSlot(int slotid);
 	PMTHandlerList m_pmt_handlers; 
diff --git a/lib/dvb_ci/dvbci_session.h b/lib/dvb_ci/dvbci_session.h
index ae0d340d..89a58f3b 100644
--- a/lib/dvb_ci/dvbci_session.h
+++ b/lib/dvb_ci/dvbci_session.h
@@ -11,7 +11,6 @@ class eDVBCISession
 {
 	DECLARE_REF(eDVBCISession);
 	static ePtr<eDVBCISession> sessions[SLMS];
-	static void deleteSessions(const eDVBCISlot *slot);
 	static void createSession(eDVBCISlot *slot, const unsigned char *resource_identifier, unsigned char &status, ePtr<eDVBCISession> &ptr);
 	static void sendSPDU(eDVBCISlot *slot, unsigned char tag,const void *data, int len, unsigned short session_nb, const void *apdu=0,int alen=0);
 	static void sendOpenSessionResponse(eDVBCISlot *slot,unsigned char session_status, const unsigned char *resource_identifier,unsigned short session_nb);
@@ -31,6 +30,7 @@ protected:
 public:
 	virtual ~eDVBCISession();
 
+	static void deleteSessions(const eDVBCISlot *slot);
 
 	int poll() { if (action) { action=doAction(); return 1; } return 0; }
 	enum { stateInCreation, stateBusy, stateInDeletion, stateStarted, statePrivate};
diff --git a/lib/gdi/font.h b/lib/gdi/font.h
index 3cdfc299..41d51ddc 100644
--- a/lib/gdi/font.h
+++ b/lib/gdi/font.h
@@ -100,9 +100,8 @@ class eLCD;
 
 class eTextPara: public iObject
 {
-DECLARE_REF(eTextPara);
-private:
- 	ePtr<Font> current_font, replacement_font;
+	DECLARE_REF(eTextPara);
+	ePtr<Font> current_font, replacement_font;
 	FT_Face current_face, replacement_face;
 	int use_kerning;
 	int previous;
@@ -183,7 +182,7 @@ public:
 
 class Font: public iObject
 {
-DECLARE_REF(Font);
+	DECLARE_REF(Font);
 public:
 #ifdef HAVE_FREETYPE2
 	FTC_ScalerRec scaler;
diff --git a/lib/gdi/gfont.h b/lib/gdi/gfont.h
index d6697ce0..8816f018 100644
--- a/lib/gdi/gfont.h
+++ b/lib/gdi/gfont.h
@@ -12,7 +12,7 @@
  */
 class gFont: public iObject
 {
-DECLARE_REF(gFont);
+	DECLARE_REF(gFont);
 public:
 
 	std::string family;
diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 478ca46c..7071425e 100644
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -145,8 +145,7 @@ struct gOpcode
 		/* gRC is the singleton which controls the fifo and dispatches commands */
 class gRC: public iObject, public Object
 {
-DECLARE_REF(gRC);
-private:
+	DECLARE_REF(gRC);
 	friend class gPainter;
 	static gRC *instance;
 
@@ -257,7 +256,7 @@ public:
 
 class gDC: public iObject
 {
-DECLARE_REF(gDC);
+	DECLARE_REF(gDC);
 protected:
 	ePtr<gPixmap> m_pixmap;
 
diff --git a/lib/gui/ewindowstyle.h b/lib/gui/ewindowstyle.h
index c204a034..5008cd6e 100644
--- a/lib/gui/ewindowstyle.h
+++ b/lib/gui/ewindowstyle.h
@@ -86,7 +86,6 @@ SWIG_EXTEND(ePtr<eWindowStyleManager>,
 class eWindowStyleSimple: public eWindowStyle
 {
 	DECLARE_REF(eWindowStyleSimple);
-private:
 	ePtr<gFont> m_fnt;
 	gColor m_border_color_tl, m_border_color_br, m_title_color_back, m_title_color, m_background_color;
 	
diff --git a/lib/nav/core.h b/lib/nav/core.h
index b82d2fbd..01efe9af 100644
--- a/lib/nav/core.h
+++ b/lib/nav/core.h
@@ -9,7 +9,6 @@
 class eNavigation: public iObject, public Object
 {
 	DECLARE_REF(eNavigation);
-private:
 	ePtr<iServiceHandler> m_servicehandler;
 
 	ePtr<iPlayableService> m_runningService;
diff --git a/lib/nav/pcore.h b/lib/nav/pcore.h
index c485f7d0..1d314b19 100644
--- a/lib/nav/pcore.h
+++ b/lib/nav/pcore.h
@@ -8,7 +8,7 @@
 
 class pNavigation: public iObject, public Object
 {
-DECLARE_REF(pNavigation);
+	DECLARE_REF(pNavigation);
 public:
 	PSignal1<void, int> m_event;
 	PSignal2<void, ePtr<iRecordableService>&, int> m_record_event;
diff --git a/lib/network/http_dyn.h b/lib/network/http_dyn.h
index 24e4dba1..26fca877 100644
--- a/lib/network/http_dyn.h
+++ b/lib/network/http_dyn.h
@@ -6,7 +6,6 @@
 class eHTTPDyn: public eHTTPDataSource
 {
 	DECLARE_REF(eHTTPDyn);
-private:
 	std::string result;
 	int wptr, size;
 public:
@@ -18,7 +17,6 @@ public:
 class eHTTPDynPathResolver: public iHTTPPathResolver
 {
 	DECLARE_REF(eHTTPDynPathResolver);
-private:
 	struct eHTTPDynEntry: public iObject
 	{
 		DECLARE_REF(eHTTPDynEntry);
diff --git a/lib/network/httpd.h b/lib/network/httpd.h
index aa8c5288..1c6678b0 100644
--- a/lib/network/httpd.h
+++ b/lib/network/httpd.h
@@ -42,7 +42,6 @@ typedef ePtr<eHTTPDataSource> eHTTPDataSourcePtr;
 class eHTTPError: public eHTTPDataSource
 {
 	DECLARE_REF(eHTTPError);
-private:
 	int errcode;
 public:
 	eHTTPError(eHTTPConnection *c, int errcode);
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h
index bc92b37e..d0a6bb35 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h
@@ -12,7 +12,7 @@ class eStaticServiceDVDInfo;
 
 class eServiceFactoryDVD: public iServiceHandler
 {
-DECLARE_REF(eServiceFactoryDVD);
+	DECLARE_REF(eServiceFactoryDVD);
 public:
 	eServiceFactoryDVD();
 	virtual ~eServiceFactoryDVD();
@@ -30,7 +30,7 @@ class eServiceDVD: public iPlayableService, public iPauseableService, public iSe
 	public iServiceInformation, public iSubtitleOutput, public iServiceKeys, public iCueSheet, public eThread, public Object
 {
 	friend class eServiceFactoryDVD;
-DECLARE_REF(eServiceDVD);
+	DECLARE_REF(eServiceDVD);
 public:
 	virtual ~eServiceDVD();
 		// not implemented (yet)
diff --git a/lib/service/event.h b/lib/service/event.h
index 8c214af6..4c354079 100644
--- a/lib/service/event.h
+++ b/lib/service/event.h
@@ -14,14 +14,14 @@ class Event;
 SWIG_IGNORE(eComponentData);
 struct eComponentData
 {
-DECLARE_REF(eComponentData);
-#ifndef SWIG
+	friend class eServiceEvent;
+	DECLARE_REF(eComponentData);
 	uint8_t m_streamContent;
 	uint8_t m_componentType;
 	uint8_t m_componentTag;
 	std::string m_iso639LanguageCode;
 	std::string m_text;
-#endif
+public:
 	eComponentData(const eComponentData& d) { *this = d; } 
 	eComponentData() { m_streamContent = m_componentType = m_componentTag = 0; }
 	int getStreamContent(void) const { return m_streamContent; }
diff --git a/lib/service/service.h b/lib/service/service.h
index 3929f752..6f6ab980 100644
--- a/lib/service/service.h
+++ b/lib/service/service.h
@@ -13,8 +13,7 @@ typedef ePtr<eServiceCenter> eServiceCenterPtr;
 
 class eServiceCenter: public iServiceHandler
 {
-DECLARE_REF(eServiceCenter);
-private:
+	DECLARE_REF(eServiceCenter);
 	std::map<int,ePtr<iServiceHandler> > handler;
 	std::map<int,std::list<std::string> > extensions;
 	static eServiceCenter *instance;
diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 0c5710d8..0bd12bd8 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -38,7 +38,7 @@ class eBouquet;
 
 class eDVBServiceList: public iListableService, public iMutableServiceList
 {
-DECLARE_REF(eDVBServiceList);
+	DECLARE_REF(eDVBServiceList);
 public:
 	virtual ~eDVBServiceList();
 	PyObject *getContent(const char* formatstr, bool sorted=false);
@@ -91,7 +91,7 @@ class eDVBServicePlay: public eDVBServiceBase,
 		public iCueSheet, public iSubtitleOutput, public iAudioDelay,
 		public iRdsDecoder, public iStreamableService
 {
-DECLARE_REF(eDVBServicePlay);
+	DECLARE_REF(eDVBServicePlay);
 public:
 	virtual ~eDVBServicePlay();
 
diff --git a/lib/service/servicedvbrecord.h b/lib/service/servicedvbrecord.h
index dcce3388..b46a73ea 100644
--- a/lib/service/servicedvbrecord.h
+++ b/lib/service/servicedvbrecord.h
@@ -15,7 +15,7 @@ class eDVBServiceRecord: public eDVBServiceBase,
 	public iStreamableService,
 	public Object
 {
-DECLARE_REF(eDVBServiceRecord);
+	DECLARE_REF(eDVBServiceRecord);
 public:
 	RESULT connectEvent(const Slot2<void,iRecordableService*,int> &event, ePtr<eConnection> &connection);
 	RESULT prepare(const char *filename, time_t begTime, time_t endTime, int eit_event_id);
diff --git a/lib/service/servicefs.h b/lib/service/servicefs.h
index d05eef19..eabdd3c7 100644
--- a/lib/service/servicefs.h
+++ b/lib/service/servicefs.h
@@ -5,7 +5,7 @@
 
 class eServiceFactoryFS: public iServiceHandler
 {
-DECLARE_REF(eServiceFactoryFS);
+	DECLARE_REF(eServiceFactoryFS);
 public:
 	eServiceFactoryFS();
 	virtual ~eServiceFactoryFS();
@@ -23,8 +23,7 @@ private:
 
 class eServiceFS: public iListableService
 {
-DECLARE_REF(eServiceFS);
-private:
+	DECLARE_REF(eServiceFS);
 	std::string path;
 	friend class eServiceFactoryFS;
 	eServiceFS(const char *path, const char *additional_extensions=0);
diff --git a/lib/service/servicemp3.h b/lib/service/servicemp3.h
index 71291af9..08b712c3 100644
--- a/lib/service/servicemp3.h
+++ b/lib/service/servicemp3.h
@@ -10,7 +10,7 @@ class eStaticServiceMP3Info;
 
 class eServiceFactoryMP3: public iServiceHandler
 {
-DECLARE_REF(eServiceFactoryMP3);
+	DECLARE_REF(eServiceFactoryMP3);
 public:
 	eServiceFactoryMP3();
 	virtual ~eServiceFactoryMP3();
@@ -41,7 +41,7 @@ typedef struct _GstElement GstElement;
 class eServiceMP3: public iPlayableService, public iPauseableService, 
 	public iServiceInformation, public iSeekableService, public Object
 {
-DECLARE_REF(eServiceMP3);
+	DECLARE_REF(eServiceMP3);
 public:
 	virtual ~eServiceMP3();
 
diff --git a/lib/service/servicexine.h b/lib/service/servicexine.h
index 4bf7e3eb..b18f6785 100644
--- a/lib/service/servicexine.h
+++ b/lib/service/servicexine.h
@@ -13,7 +13,7 @@ class eStaticServiceXineInfo;
 
 class eServiceFactoryXine: public iServiceHandler
 {
-DECLARE_REF(eServiceFactoryXine);
+	DECLARE_REF(eServiceFactoryXine);
 public:
 	eServiceFactoryXine();
 	virtual ~eServiceFactoryXine();
@@ -44,7 +44,7 @@ typedef struct _GstElement GstElement;
 class eServiceXine: public iPlayableService, public iPauseableService, 
 	public iServiceInformation, public iSeekableService, public Object
 {
-DECLARE_REF(eServiceXine);
+	DECLARE_REF(eServiceXine);
 public:
 	virtual ~eServiceXine();