From ede321f9124f7af1a99c039b9fdd96e65e4b59db Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Sun, 5 Oct 2008 00:11:07 +0200
Subject: [PATCH] Cosmetics.

---
 src/main/symbian/SDL_main.cpp | 29 ++++--------------
 src/main/symbian/sdlexe.cpp   | 68 +++++++++----------------------------------
 symbian/include/sdlepocapi.h  |  2 +-
 3 files changed, 21 insertions(+), 78 deletions(-)

diff --git a/src/main/symbian/SDL_main.cpp b/src/main/symbian/SDL_main.cpp
index 02314c2..bbb4117 100644
--- a/src/main/symbian/SDL_main.cpp
+++ b/src/main/symbian/SDL_main.cpp
@@ -49,13 +49,7 @@ class EpocSdlEnvData
 
 EpocSdlEnvData* gEpocEnv;
 
-class EnvUtils
-{
-	public:
-		static void RunSingleThread();
-};
-
-void EnvUtils::RunSingleThread()
+static void RunSingleThread()
 {
 	int count = RThread().RequestCount();
 	if(count > 0)
@@ -79,7 +73,7 @@ int Panic(int aErr, int aLine)
 
 bool CEventQueue::HasData()
 {
-	EnvUtils::RunSingleThread();
+	RunSingleThread();
 	return !m_queue.empty();
 }
 
@@ -179,7 +173,7 @@ CSdlAppServ::~CSdlAppServ()
 
 int CSdlAppServ::Request(int aService)
 {
-	EnvUtils::RunSingleThread();
+	RunSingleThread();
 	iService = aService;
 	iAppThread.RequestComplete(iStatusPtr, KErrNone); 
 	return KErrNone;
@@ -466,8 +460,6 @@ void EpocSdlEnvData::Delete()
 	delete iAppSrv;
 }
 
-_LIT(KSDLMain, "SDLMain");
-
 static int MainL()
 {
 	gEpocEnv->iCleanupItems = new CArrayFixFlat<TSdlCleanupItem>(8);
@@ -512,15 +504,12 @@ static int MainL()
 	return 0;
 }
 
-static int DoMain(TAny* /*aParam*/)
+static int DoMain()
 {
 	TBool fbsconnected = EFalse;
 
 	gEpocEnv->iAppSrv->Init();	
 
-	// Call stdlib main
-	int ret = 0;
-
 	TRAPD(err, err = MainL());
 
 	// Free resources and return
@@ -542,7 +531,7 @@ static int DoMain(TAny* /*aParam*/)
 	}
 	else
 	{
-		return err == KErrNone ? ret : err;
+		return err == KErrNone ? 0 : err;
 	}
 }
 
@@ -616,9 +605,6 @@ TThreadId CSDL::CallMainL(const TMainFunc& aFunc, TRequestStatus* const aStatus,
 	gEpocEnv->iMain = aFunc;
 	const TBool args = aArg != NULL;
 
-	if(gEpocEnv->iArgv != NULL)
-		User::Leave(KErrAlreadyExists);
-
 	gEpocEnv->iArgc = args ? aArg->Count() + 1 : 0;
 	gEpocEnv->iArgv = new char*[gEpocEnv->iArgc + 2];
 
@@ -654,7 +640,7 @@ TThreadId CSDL::CallMainL(const TMainFunc& aFunc, TRequestStatus* const aStatus,
 	// when priority is not lowered screen updates much more frequently, which
 	// may be undesired, for example in case of openttd's generating world dialog
 	RThread().SetPriority(EPriorityLess);
-	DoMain( NULL );
+	DoMain();
 
 	return gEpocEnv->iId;
 }
@@ -721,9 +707,6 @@ void CSDL::Resize()
 	}
 }
 
-CSDL::CSDL()
-{}
-
 void CSDL::MrccatoCommand(TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct)
 {
 	if(aButtonAct != ERemConCoreApiButtonClick)
diff --git a/src/main/symbian/sdlexe.cpp b/src/main/symbian/sdlexe.cpp
index bb3b4f4..5fbd5b2 100644
--- a/src/main/symbian/sdlexe.cpp
+++ b/src/main/symbian/sdlexe.cpp
@@ -66,44 +66,23 @@ static void MakeCCmdLineL(const TDesC8& aParam, CDesC8Array& aArray)
 class TSdlClass
 {
 	public:
-		TSdlClass();
+		TSdlClass() : iExeFlags(0) {}
 		void SetMain(const TMainFunc& aFunc, int aExeFlags);
-		const TMainFunc& Main() const;
-		int AppFlags() const;
-		void AppFlags(int aFlags); 
+		const TMainFunc& Main() const { return iFunc; }
+		int AppFlags() const { return iExeFlags; }
+		void AppFlags(int aFlags) { iExeFlags |= aFlags; }
 
 	private:
 		TMainFunc iFunc;
 		int iExeFlags;
 };
 
-
-void TSdlClass::AppFlags(int aFlags)
-{
-	iExeFlags |= aFlags;
-}
-
-int TSdlClass::AppFlags() const
-{
-	return iExeFlags;
-}
-
 void TSdlClass::SetMain(const TMainFunc& aFunc, int aExeFlags)
 {	
 	iFunc = aFunc;
 	iExeFlags = aExeFlags;
 }
 
-const TMainFunc& TSdlClass::Main() const
-{
-	return iFunc;
-}
-
-TSdlClass::TSdlClass()
-{
-	Mem::FillZ(this, sizeof(this));
-}
-
 TSdlClass gSDLClass;
 
 ////////////////////////////////////////////////////////////////
@@ -112,16 +91,23 @@ class CExitWait : public CActive
 {
 	public:
 		CExitWait(CAknAppUi& aWait);
-		~CExitWait();
+		~CExitWait() { Cancel(); }
 
 	private:
-		void RunL();
-		void DoCancel();
+		void RunL()	{ if(iStatusPtr != NULL) iWait.Exit(); }
+		void DoCancel()	{ if(iStatusPtr != NULL) User::RequestComplete(iStatusPtr, KErrCancel); }
 
 		CAknAppUi& iWait;
 		TRequestStatus* iStatusPtr;
 };
 
+CExitWait::CExitWait(CAknAppUi& aWait) : CActive(CActive::EPriorityStandard), iWait(aWait)
+{
+	CActiveScheduler::Add(this);
+	SetActive();
+	iStatusPtr = &iStatus;
+}
+
 ////////////////////////////////////////////////////////////////////////
 
 class CSDLWin : public CCoeControl
@@ -235,32 +221,6 @@ CSDLApplication::CSDLApplication()
 	CleanupStack::PopAndDestroy();
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////
-
-CExitWait::CExitWait(CAknAppUi& aWait) : CActive(CActive::EPriorityStandard), iWait(aWait)
-{
-	CActiveScheduler::Add(this);
-	SetActive();
-	iStatusPtr = &iStatus;
-}
-
-CExitWait::~CExitWait()
-{
-	Cancel();
-}
-
-void CExitWait::RunL()
-{
-	if(iStatusPtr != NULL)
-		iWait.Exit();
-}
-
-void CExitWait::DoCancel()
-{
-	if(iStatusPtr != NULL)
-		User::RequestComplete(iStatusPtr, KErrCancel);
-}
-
 /////////////////////////////////////////////////////////////////////////
 
 CSDLAppUi::~CSDLAppUi()
diff --git a/symbian/include/sdlepocapi.h b/symbian/include/sdlepocapi.h
index f7e67e0..33759b2 100644
--- a/symbian/include/sdlepocapi.h
+++ b/symbian/include/sdlepocapi.h
@@ -68,7 +68,7 @@ class CSDL : public CBase, public MRemConCoreApiTargetObserver
 		void MrccatoCommand(TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct);
 
 	protected:
-		CSDL();
+		CSDL() {}
 };
 
 #endif
-- 
2.11.4.GIT