Convert some assignments to constructor initializer lists.

5 files changed, 11 insertions, 12 deletions

diff --git a/ttxtsubs.c b/ttxtsubs.c
index 774e74f..c880682 100644
--- a/ttxtsubs.c
+++ b/ttxtsubs.c
@@ -485,6 +485,7 @@ const char * dvbSources[5];
 cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
   :
   mTtxtsubs(ttxtsubs),
+  mSavedFrenchSpecial(globals.mFrenchSpecial),
   mDoStore(doStore),
   mConf(globals)
 {
@@ -506,8 +507,6 @@ cMenuSetupTtxtsubs::cMenuSetupTtxtsubs(cPluginTtxtsubs *ttxtsubs, int doStore)
   const int numMainMenuAlts = sizeof(mainMenuAlts) / sizeof(mainMenuAlts[0]) - 1;
   const int numDvbSources = sizeof(dvbSources) / sizeof(dvbSources[0]) - 1;
 
-  mSavedFrenchSpecial = mConf.mFrenchSpecial;
-
   for(int n = 0; n < MAXLANGUAGES; n++) {
     mLanguageNo[n] = -1;
     mLangHI[n] = mConf.mHearingImpaireds[n][0];
diff --git a/ttxtsubschannelsettings.c b/ttxtsubschannelsettings.c
index b317c6b..a0bbca8 100644
--- a/ttxtsubschannelsettings.c
+++ b/ttxtsubschannelsettings.c
@@ -25,10 +25,11 @@
 #include <vdr/tools.h>
 
 cTtxtSubsChannelSetting::cTtxtSubsChannelSetting(const cChannel *Channel, int PageMode, int PageNumber)
+  :
+  channelid(Channel->GetChannelID()),
+  pagemode(PageMode),
+  pagenumber(PageNumber)
 {
-  channelid=Channel->GetChannelID();
-  pagemode=PageMode;
-  pagenumber=PageNumber;
 }
 
 bool cTtxtSubsChannelSetting::Parse(const char *s)
diff --git a/ttxtsubsdisplay.c b/ttxtsubsdisplay.c
index 9453a2f..6ab0bbd 100644
--- a/ttxtsubsdisplay.c
+++ b/ttxtsubsdisplay.c
@@ -105,12 +105,11 @@ cTtxtSubsDisplay::cTtxtSubsDisplay(void)
         _doDisplay(1),
         _osd(NULL),
         _osdLock(),
-        _lastDataTime(NULL)
+        _lastDataTime((struct timeval *) calloc(1, sizeof(*_lastDataTime))),
+        _osdFont(cFont::CreateFont(Setup.FontOsd, globals.mFontSize))
 {
     memset(&_page.data, 0, sizeof(_page.data));
-    _lastDataTime = (struct timeval *) calloc(1, sizeof(*_lastDataTime));
 
-    _osdFont = cFont::CreateFont(Setup.FontOsd, globals.mFontSize);
     if (!_osdFont || !_osdFont->Height())
     {
         _osdFont = cFont::GetFont(fontOsd);
diff --git a/ttxtsubsdisplayer.c b/ttxtsubsdisplayer.c
index 56b4ebc..bdcc4d7 100644
--- a/ttxtsubsdisplayer.c
+++ b/ttxtsubsdisplayer.c
@@ -28,13 +28,12 @@
 
 cTtxtSubsDisplayer::cTtxtSubsDisplayer(int textpage)
   :
-  mDisp(NULL),
+  mDisp(new cTtxtSubsDisplay()),
   mGetMutex(),
   mGetCond(),
   mRingBuf(94000, true),
   mRun(0)
 {
-  mDisp = new cTtxtSubsDisplay();
   mDisp->SetPage(textpage);
 
   mRun = 1;
diff --git a/ttxtsubslivereceiver.c b/ttxtsubslivereceiver.c
index cfe3288..3f35bbb 100644
--- a/ttxtsubslivereceiver.c
+++ b/ttxtsubslivereceiver.c
@@ -23,9 +23,10 @@
 #include "ttxtsubslivereceiver.h"
 
 cTtxtSubsLiveReceiver::cTtxtSubsLiveReceiver(cChannel* channel, cVDRTtxtsubsHookListener* hook)
+  :
+  _channel(channel),
+  _hook(hook)
 {
-  _channel = channel;
-  _hook = hook;
   AddPid(channel->Tpid());
 }