after DECLARE_REF now all is private.. not public

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

7 files changed, 13 insertions, 15 deletions

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();