From patchwork Sun Mar 12 14:35:27 2006 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Salt X-Patchwork-Id: 12225 Received: from anchor-post-35.mail.demon.net ([194.217.242.85]) by www.linuxtv.org with esmtp (Exim 4.50) id 1FIRlw-0000SD-TR for vdr@linuxtv.org; Sun, 12 Mar 2006 15:42:16 +0100 Received: from youmustbejoking.demon.co.uk ([212.228.127.8] helo=pentagram.youmustbejoking.demon.co.uk) by anchor-post-35.mail.demon.net with esmtp (Exim 4.42) id 1FIRlq-0003yc-I6 for vdr@linuxtv.org; Sun, 12 Mar 2006 14:42:16 +0000 Received: from [192.168.0.2] (helo=riscpc) by pentagram.youmustbejoking.demon.co.uk with esmtp (Exim 4.50) id 1FIRlp-0005S7-11 for vdr@linuxtv.org; Sun, 12 Mar 2006 14:42:09 +0000 Date: Sun, 12 Mar 2006 14:35:27 +0000 From: Darren Salt To: vdr@linuxtv.org Message-ID: <4E067CD2B6%linux@youmustbejoking.demon.co.uk> User-Agent: Messenger-Pro/4.09b1 (MsgServe/3.24b1) (RISC-OS/4.02) POPstar/2.06+cvs X-Editor: Zap 1.47 (17 Oct 2005) [TEST], ZapEmail 0.28.3 (25 Mar 2005) (32) X-SDate: Sun, 4576 Sep 1993 14:35:27 +0000 X-Message-Flag: Outlook Express is broken. Upgrade to mail(1). MIME-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.0.2 X-SA-Exim-Mail-From: linux@youmustbejoking.demon.co.uk X-SA-Exim-Scanned: No (on pentagram.youmustbejoking.demon.co.uk); SAEximRunCond expanded to false Subject: [vdr] [PATCH] epgsearch: g++-4.1 fixups etc. X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Mar 2006 14:42:17 -0000 Status: O X-Status: X-Keywords: X-UID: 8378 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. 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);