fix deprecated conversion from string constant to char* by using const char* instead...

[enigma2.git] / lib / dvb / epgcache.h

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 98a38451a2f1b3cfc727fcc2981e0f37384378ef..5e5e7e8e3927e37a7dd6601e123e028b6332cc35 100644 (file)
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -204,7 +204,7 @@ class eEPGCache: public eMainloop, private eThread, public Object
                void abortEPG();
                void abortNonAvail();
        };
-       void FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service);
+       bool FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service);
 public:
        enum {PRIVATE=0, NOWNEXT=1, SCHEDULE=2, SCHEDULE_OTHER=4
 #ifdef ENABLE_MHW_EPG
@@ -309,9 +309,9 @@ public:
 #ifndef SWIG
        // eventData's are plain entrys out of the cache.. it's not safe to use them after cache unlock
        // but its faster in use... its not allowed to delete this pointers via delete or free..
-       SWIG_VOID(RESULT) lookupEventId(const eServiceReference &service, int event_id, const eventData *&SWIG_OUTPUT);
-       SWIG_VOID(RESULT) lookupEventTime(const eServiceReference &service, time_t, const eventData *&SWIG_OUTPUT, int direction=0);
-       SWIG_VOID(RESULT) getNextTimeEntry(const eventData *&SWIG_OUTPUT);
+       RESULT lookupEventId(const eServiceReference &service, int event_id, const eventData *&);
+       RESULT lookupEventTime(const eServiceReference &service, time_t, const eventData *&, int direction=0);
+       RESULT getNextTimeEntry(const eventData *&);
 
        // eit_event_struct's are plain dvb eit_events .. it's not safe to use them after cache unlock
        // its not allowed to delete this pointers via delete or free..