From bfa57ea9e0c22a8acd18f35f262aa3e07fb2a617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 22 Oct 2011 15:46:07 +0300
Subject: Convert some uses of assignments to initializer lists in
 constructors.

---
 bitmap.c |  7 ++++---
 file.c   |  5 +++--
 i18n.c   |  4 ++--
 menu.c   |  5 +++--
 screen.c | 13 ++++---------
 setup.c  | 17 +++++++++--------
 6 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/bitmap.c b/bitmap.c
index 8159536..ac287b7 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -93,9 +93,10 @@ void cText2SkinBitmap::Init(void) {
 	mCache.SetMaxItems(Text2SkinSetup.MaxCacheFill);
 }
 
-cText2SkinBitmap::cText2SkinBitmap(void) {
-	mCurrent = 0;
-	mLastGet = 0;
+cText2SkinBitmap::cText2SkinBitmap(void):
+	mCurrent(0),
+	mLastGet(0)
+{
 }
 
 cText2SkinBitmap::~cText2SkinBitmap() {
diff --git a/file.c b/file.c
index c4582fa..0012568 100644
--- a/file.c
+++ b/file.c
@@ -1,8 +1,9 @@
 #include "file.h"
 #include <unistd.h>
 
-cText2SkinFile::cText2SkinFile(const char *Skin) {
-	mSkin = Skin;
+cText2SkinFile::cText2SkinFile(const char *Skin):
+	mSkin(Skin)
+{
 }
 
 cText2SkinFile::~cText2SkinFile() {
diff --git a/i18n.c b/i18n.c
index 617ed09..1d38506 100644
--- a/i18n.c
+++ b/i18n.c
@@ -1,8 +1,8 @@
 #include "i18n.h"
 #include <vdr/config.h>
 
-cText2SkinI18n::cText2SkinI18n(const char *Skin)
+cText2SkinI18n::cText2SkinI18n(const char *Skin) :
+	mIdentity(std::string("vdr-"PLUGIN_NAME_I18N"-") + Skin)
 {
-	mIdentity   = std::string("vdr-"PLUGIN_NAME_I18N"-") + Skin;
 	I18nRegister(mIdentity.substr(mIdentity.find('-') + 1).c_str());
 }
diff --git a/menu.c b/menu.c
index 3c3c157..a2915a7 100644
--- a/menu.c
+++ b/menu.c
@@ -3,8 +3,9 @@
 
 // --- cText2SkinSetupPage ----------------------------------------------------
 
-cText2SkinSetupPage::cText2SkinSetupPage(void) {
-	mData = Text2SkinSetup;
+cText2SkinSetupPage::cText2SkinSetupPage(void):
+	mData(Text2SkinSetup)
+{
 	Setup();
 }
 
diff --git a/screen.c b/screen.c
index 5e2e3ab..4a7dcd0 100644
--- a/screen.c
+++ b/screen.c
@@ -1,15 +1,10 @@
 #include "screen.h"
 
-cText2SkinScreen::cText2SkinScreen(bool OffScreen) 
+cText2SkinScreen::cText2SkinScreen(bool OffScreen):
+	mOsd(OffScreen ? NULL : cOsdProvider::NewOsd(0, 0)),
+	mScreen(OffScreen ? new cBitmap(720, 576, 8) : NULL),
+	mOffScreen(OffScreen)
 {
-	mOsd       = NULL;
-	mScreen    = NULL;
-	mOffScreen = OffScreen;
-
-	if (mOffScreen)
-		mScreen = new cBitmap(720, 576, 8);
-	else
-		mOsd = cOsdProvider::NewOsd(0, 0);
 }
 
 cText2SkinScreen::~cText2SkinScreen() 
diff --git a/setup.c b/setup.c
index e49f714..998f8f5 100644
--- a/setup.c
+++ b/setup.c
@@ -4,14 +4,15 @@ cText2SkinSetup Text2SkinSetup;
 
 // --- cText2SkinSetup --------------------------------------------------------
 
-cText2SkinSetup::cText2SkinSetup(void) {
-	MenuScrollbar = false;
-	MarqueeLeftRight = true;
-	MarqueeReset = false;
-	ShowAux = true;
-	StripAux = true;
-	CheckTimerConflict = false;
-	MaxCacheFill = 25;
+cText2SkinSetup::cText2SkinSetup(void):
+	MenuScrollbar(false),
+	MarqueeLeftRight(true),
+	MarqueeReset(false),
+	ShowAux(true),
+	StripAux(true),
+	CheckTimerConflict(false),
+	MaxCacheFill(25)
+{
 }
 
 bool cText2SkinSetup::SetupParse(const char *Name, const char *Value) {
-- 
cgit v1.2.3