epgsearch: g++-4.1 fixups etc.

Message ID 4E067CD2B6%linux@youmustbejoking.demon.co.uk
State New
Headers

Commit Message

Darren Salt March 12, 2006, 2:35 p.m. UTC
  Patches attached.

* The g++-4.1 fixes are required to avoid "extra qualification 'foo::' on
  member 'bar'" errors.

* 10 characters for the channel name isn't enough ("BBC Radio ").

* Use of thread-unsafe function.

* The constness fixes patch, as well as making a few things constant, gets
  rid of multiple declarations of AllowedChars.
  

Comments

Christian Wieninger March 12, 2006, 8:04 p.m. UTC | #1
Hi Darren,

thanks for the patches. Will be part of the next release.

Am Sonntag, 12. März 2006 15:35 schrieb Darren Salt:
> * 10 characters for the channel name isn't enough ("BBC Radio ").

12 characters too ;-) Depending on the skin/font 12 chars may end up in an 
ugly menuitem, that sticks to near to the start time. But since it works with 
12 in my favorite skin, I will also integrate this patch and hope there will 
be no complaints ;-)

BR,

Christian
  

Patch

diff -u vdr-plugin-epgsearch-0.9.14a~/log.h vdr-plugin-epgsearch-0.9.14a/log.h
--- vdr-plugin-epgsearch-0.9.14a~/log.h
+++ vdr-plugin-epgsearch-0.9.14a/log.h
@@ -9,7 +9,7 @@ 
 {
     int loglevel;
  public:
-    void cLogFile::Open(const char* filename, int LogLevel, const char* version)
+    void Open(const char* filename, int LogLevel, const char* version)
 	{
 	    loglevel = LogLevel;
 	    if (loglevel == 0) return;
@@ -18,7 +18,7 @@ 
 	    Log(1, "---------------------------------------", loglevel);
 	    Log(1, "EPGSearch log started (verbose level %d, version %s)", loglevel, version);
 	}
-    void cLogFile::Log(int LogLevel, const char *text, ...)
+    void Log(int LogLevel, const char *text, ...)
 	{
 	    if (LogLevel > loglevel) return;
 	    if(IsOpen()) 
diff -u vdr-plugin-epgsearch-0.9.14a~/searchtimer_thread.h vdr-plugin-epgsearch-0.9.14a/searchtimer_thread.h
--- vdr-plugin-epgsearch-0.9.14a~/searchtimer_thread.h
+++ vdr-plugin-epgsearch-0.9.14a/searchtimer_thread.h
@@ -25,7 +25,7 @@ 
     void Stop(void);
     bool NeedUpdate();
  public:
-    static char* cSearchTimerThread::SummaryExtended(cSearchExt* searchExt, cTimer* Timer, const cEvent* pEvent);
+    static char* SummaryExtended(cSearchExt* searchExt, cTimer* Timer, const cEvent* pEvent);
     static cSearchTimerThread *m_Instance;
 
     static cTimer* GetTimer(cSearchExt *searchExt, const cEvent *pEvent, bool& bTimesMatchExactly);