From 1421336587c6005c883c2f7db55766f8deda465c Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Mon, 20 Oct 2008 23:08:14 +0200
Subject: [PATCH] Remove some panic crap.

---
 src/main/symbian/SDL_main.cpp       | 28 ----------------------------
 symbian/include/internal/epoc_sdl.h |  2 --
 symbian/include/sdlepocapi.h        |  1 -
 3 files changed, 31 deletions(-)

diff --git a/src/main/symbian/SDL_main.cpp b/src/main/symbian/SDL_main.cpp
index 9abcd69..8f34d56 100644
--- a/src/main/symbian/SDL_main.cpp
+++ b/src/main/symbian/SDL_main.cpp
@@ -126,8 +126,6 @@ class CSdlAppServ : public CActive
 		int Request(int aService);
 		int RequestValue(int aService);
 		void Init(); 
-		void PanicMain(int aReason);
-		void PanicMain(const TDesC& aInfo, int aReason);
 		void SetParam(int aParam);
 
 	private:
@@ -143,16 +141,6 @@ class CSdlAppServ : public CActive
 CSdlAppServ::CSdlAppServ() : CActive(CActive::EPriorityHigh), iMainId(RThread().Id())
 {}
 
-void CSdlAppServ::PanicMain(int aReason)
-{
-	iAppThread.Panic(RThread().Name(), aReason);
-}
-
-void CSdlAppServ::PanicMain(const TDesC& aInfo, int aReason)
-{
-	iAppThread.Panic(aInfo, aReason);
-}
-
 void CSdlAppServ::ConstructL()
 {
 	CActiveScheduler::Add(this);
@@ -304,12 +292,6 @@ int EpocSdlEnv::SetPalette(int aFirstcolor, int aColorCount, TUint32* aPalette)
 	return 	gEpocEnv->iDsa->SetPalette(aFirstcolor, aColorCount, aPalette);
 }
 
-void EpocSdlEnv::PanicMain(int aErr)
-{
-	gEpocEnv->iAppSrv->PanicMain(aErr);
-}
-
-
 int EpocSdlEnv::AppendCleanupItem(const TSdlCleanupItem& aItem)
 {
 	TRAPD(err, gEpocEnv->iCleanupItems->AppendL(aItem));
@@ -360,11 +342,6 @@ void EpocSdlEnv::FreeSurface()
 		gEpocEnv->iDsa->Free();
 }
 
-void EpocSdlEnv::PanicMain(const TDesC& aInfo, int aErr)
-{
-	gEpocEnv->iAppSrv->PanicMain(aInfo, aErr);
-}
-
 //Dsa is a low priority ao, it has to wait if its pending event, but ws
 //event has been prioritized before it
 //this is not called from app thread!
@@ -607,11 +584,6 @@ void CSDL::AppendWsEvent(const TWsEvent& aEvent)
 	EpocSdlEnv::EventQueue().Append(aEvent);
 }
 
-void CSDL::SDLPanic(const TDesC& aInfo, int aErr)
-{
-	EpocSdlEnv::PanicMain(aInfo, aErr);
-}
-
 void CSDL::Resize()
 {
 	if(gEpocEnv->iWaitingForOrientationChange)
diff --git a/symbian/include/internal/epoc_sdl.h b/symbian/include/internal/epoc_sdl.h
index ab22581..872f25d 100644
--- a/symbian/include/internal/epoc_sdl.h
+++ b/symbian/include/internal/epoc_sdl.h
@@ -53,8 +53,6 @@ class EpocSdlEnv
 		static TUint8* LockHwSurface();
 		static void UpdateSwSurface();
 		static TBool AddUpdateRect(TUint8* aAddress, const TRect& aUpdateRect, const TRect& aTargetRect);
-		static void PanicMain(TInt aErr);
-		static void PanicMain(const TDesC& aInfo, TInt aErr);
 		static void WaitDeviceChange();
 		static TInt SetPalette(TInt aFirstcolor, TInt aColorCount, TUint32* aPalette);
 		static void ObserverEvent(TInt aService, TInt aParam = 0);
diff --git a/symbian/include/sdlepocapi.h b/symbian/include/sdlepocapi.h
index d6f461b..a19272d 100644
--- a/symbian/include/sdlepocapi.h
+++ b/symbian/include/sdlepocapi.h
@@ -55,7 +55,6 @@ class CSDL : public CBase, public MRemConCoreApiTargetObserver
 		void SetContainerWindowL(RWindow& aWindow, RWsSession& aSession, CWsScreenDevice& aDevice); //the window where drawn happens, should be recalled (propably in application HandleResourceChange) if screen device changes
 		~CSDL();
 		void AppendWsEvent(const TWsEvent& aEvent);	//give event to SDL
-		void SDLPanic(const TDesC& aInfo, TInt aErr); //Panic from SDL thread (see SDLThreadEvent)
 		TThreadId CallMainL(const TMainFunc& aFunc, TRequestStatus* const aStatus, const CDesC8Array* const iArg); //internal
 		void Resize();
 
-- 
2.11.4.GIT