Fix code formatting to be compliant with our rules.

It may happen that I broke something since I have no means to compile it.
Also I changed EScummVM -> ScummVM is several places.

svn-id: r19734

6 files changed, 160 insertions, 132 deletions

diff --git a/backends/epoc/build/S60/ScummVMApp.cpp b/backends/epoc/build/S60/ScummVMApp.cpp
index c5c365d2a8..638721e661 100644
--- a/backends/epoc/build/S60/ScummVMApp.cpp
+++ b/backends/epoc/build/S60/ScummVMApp.cpp
@@ -21,13 +21,13 @@
  * $Header$
  */
 
-#include "ScummVMapp.h"
+#include "backends/epoc/build/S60/ScummVMapp.h"
 #include <escummvms60.rsg>
 #include <apgcli.h>
 #include <eikdll.h>
 
-EXPORT_C CApaApplication* NewApplication() {
-        return (new CScummVM);
+EXPORT_C CApaApplication *NewApplication() {
+	return (new CScummVM);
 }
 
 CScummVM::CScummVM() {
@@ -36,28 +36,26 @@ CScummVM::CScummVM() {
 CScummVM::~CScummVM() {
 }
 
-CApaDocument* CScummVM::CreateDocumentL()
-{
-	return new (ELeave) CScummVMDoc(*this);
+CApaDocument *CScummVM::CreateDocumentL() {
+	return new (ELeave)CScummVMDoc(*this);
 }
 
-TUid CScummVM::AppDllUid() const
-{
+TUid CScummVM::AppDllUid() const {
 	return TUid::Uid(0x101f9b57);
 }
 
-CScummVMDoc::CScummVMDoc(CEikApplication& aApp):CAknDocument(aApp) {
+CScummVMDoc::CScummVMDoc(CEikApplication &aApp) : CAknDocument(aApp) {
 }
 
 CScummVMDoc::~CScummVMDoc() {
 }
 
-CEikAppUi* CScummVMDoc::CreateAppUiL() {
-	return new (ELeave) CScummVMUi;
+CEikAppUi *CScummVMDoc::CreateAppUiL() {
+	return new (ELeave)CScummVMUi;
 }
 
 void CScummVMUi::HandleForegroundEventL(TBool aForeground) {
-	if(aForeground) {
+	if (aForeground) {
 		BringUpEmulatorL();
 	}
 }
@@ -80,33 +78,38 @@ void CScummVMUi::ConstructL() {
 	TBuf<128> startFile;
 	startFile = iEikonEnv->EikAppUi()->Application()->AppFullName();
 	TParse parser;
-	parser.Set(startFile,NULL,NULL);
+	parser.Set(startFile, NULL, NULL);
 
 	startFile = parser.DriveAndPath();
 #ifndef __WINS__
-	startFile.Append( _L("EScummVM.exe"));
+	startFile.Append( _L("ScummVM.exe"));
 #else
-	startFile.Append( _L("EScummVM.dll"));
+	startFile.Append( _L("ScummVM.dll"));
 #endif
-	CApaCommandLine* cmdLine=CApaCommandLine::NewLC(startFile);
+	CApaCommandLine *cmdLine = CApaCommandLine::NewLC(startFile);
 	RApaLsSession lsSession;
+
 	lsSession.Connect();
 	CleanupClosePushL(lsSession);
-	lsSession.StartApp(*cmdLine,iThreadId);
-	CleanupStack::PopAndDestroy();//close lsSession
+	lsSession.StartApp(*cmdLine, iThreadId);
+	CleanupStack::PopAndDestroy(); //close lsSession
 	CleanupStack::PopAndDestroy(cmdLine);
-	User::After(500000);// Let the application start
+
+	User::After(500000); // Let the application start
 
 	TApaTaskList taskList(iEikonEnv->WsSession());
+
 	TApaTask myTask=taskList.FindApp(TUid::Uid(0x101f9b57));
 	myTask.SendToBackground();
+
 	TApaTask exeTask=taskList.FindByPos(0);
 	iExeWgId=exeTask.WgId();
 
 	if(iExeWgId == myTask.WgId()) { // Should n't be the same
 		Exit();
 	}
-	if(iThreadWatch.Open(iThreadId)==KErrNone) {
+
+	if(iThreadWatch.Open(iThreadId) == KErrNone) {
 		iWatcher = new (ELeave)CScummWatcher;
 		iWatcher->iAppUi=this;
 		iThreadWatch.Logon(iWatcher->iStatus);
@@ -131,34 +134,33 @@ void CScummWatcher::RunL() {
 
 void CScummVMUi::BringUpEmulatorL() {
 	RThread thread;
-	if(thread.Open(iThreadId)==KErrNone) {
+
+	if (thread.Open(iThreadId) == KErrNone) {
 		thread.Close();
 		TApaTask apaTask(iEikonEnv->WsSession());
 		apaTask.SetWgId(iExeWgId);
 		apaTask.BringToForeground();
-	}
-	else
-	{
-		iExeWgId=-1;
+	} else {
+		iExeWgId = -1;
 	}
 }
 
 void CScummVMUi::HandleCommandL(TInt aCommand) {
 	switch(aCommand) {
 	case EEikCmdExit:
-	{
-		RThread thread;
-		if(thread.Open(iThreadId)==KErrNone)
 		{
-			thread.Terminate(0);
-			thread.Close();
+			RThread thread;
+
+			if(thread.Open(iThreadId) == KErrNone) {
+				thread.Terminate(0);
+				thread.Close();
+			}
+			Exit();
 		}
-		Exit();
-	}
-	break;
+		break;
 	}
 }
 
-GLDEF_C  TInt E32Dll(TDllReason) {
+GLDEF_C TInt E32Dll(TDllReason) {
 	return KErrNone;
 }
diff --git a/backends/epoc/build/S60/ScummVMApp.h b/backends/epoc/build/S60/ScummVMApp.h
index 8d16e47073..8cb622cac6 100644
--- a/backends/epoc/build/S60/ScummVMApp.h
+++ b/backends/epoc/build/S60/ScummVMApp.h
@@ -36,7 +36,8 @@ class CScummVM:public CEikApplication {
 public:
 	CScummVM();
 	~CScummVM();
-	CApaDocument* CreateDocumentL();
+
+	CApaDocument *CreateDocumentL();
 	TUid AppDllUid() const;
 };
 
@@ -45,35 +46,39 @@ public:
 
 class CScummVMDoc:public  CAknDocument {
 public:
+	CScummVMDoc(CEikApplication &aApplicaiton);
 	~CScummVMDoc();
-	CEikAppUi* CreateAppUiL();
+
+	CEikAppUi *CreateAppUiL();
 	void ConstructL();
-	CScummVMDoc(CEikApplication& aApplicaiton);
 };
 
 #include <aknappui.h>
 class CScummVMUi;
-class CScummWatcher:public CActive {
+class CScummWatcher : public CActive {
 public:
 	CScummWatcher();
 	~CScummWatcher();
+
 	void DoCancel();
 	void RunL();
-	CScummVMUi* iAppUi;
+	CScummVMUi *iAppUi;
 };
 
-class CScummVMUi:public CAknAppUi {
+class CScummVMUi : public CAknAppUi {
 public:
 	CScummVMUi();
 	~CScummVMUi();
+
 	void ConstructL();
 	void HandleCommandL(TInt aCommand);
 	void HandleForegroundEventL(TBool aForeground);
 	void BringUpEmulatorL();
+
 private:
 	TThreadId iThreadId;
 	TInt iExeWgId;
 	RThread iThreadWatch;
-	CScummWatcher* iWatcher;
+	CScummWatcher *iWatcher;
 };
 #endif
diff --git a/backends/epoc/build/S80/ScummVMApp.cpp b/backends/epoc/build/S80/ScummVMApp.cpp
index 69165ea3ca..15db5fea12 100644
--- a/backends/epoc/build/S80/ScummVMApp.cpp
+++ b/backends/epoc/build/S80/ScummVMApp.cpp
@@ -21,13 +21,14 @@
  * $Header$
  */
 
-#include "ScummVMapp.h"
+#include "backends/epoc/build/S80/ScummVMapp.h"
 #include <escummvms80.rsg>
 #include <apgcli.h>
 #include <eikdll.h>
 #include <apgtask.h>
-EXPORT_C CApaApplication* NewApplication() {
-        return (new CScummVM);
+
+EXPORT_C CApaApplication *NewApplication() {
+	return (new CScummVM);
 }
 
 CScummVM::CScummVM() {
@@ -36,24 +37,22 @@ CScummVM::CScummVM() {
 CScummVM::~CScummVM() {
 }
 
-CApaDocument* CScummVM::CreateDocumentL()
-{
-	return new (ELeave) CScummVMDoc(*this);
+CApaDocument *CScummVM::CreateDocumentL() {
+	return new (ELeave)CScummVMDoc(*this);
 }
 
-TUid CScummVM::AppDllUid() const
-{
+TUid CScummVM::AppDllUid() const {
 	return TUid::Uid(0x101f9b57);
 }
 
-CScummVMDoc::CScummVMDoc(CEikApplication& aApp):CEikDocument(aApp) {
+CScummVMDoc::CScummVMDoc(CEikApplication &aApp) : CEikDocument(aApp) {
 }
 
 CScummVMDoc::~CScummVMDoc() {
 }
 
-CEikAppUi* CScummVMDoc::CreateAppUiL() {
-	return new (ELeave) CScummVMUi;
+CEikAppUi *CScummVMDoc::CreateAppUiL() {
+	return new (ELeave)CScummVMUi;
 }
 
 void CScummVMUi::HandleForegroundEventL(TBool aForeground) {
@@ -84,37 +83,45 @@ void CScummVMUi::ConstructL() {
 
 	startFile = parser.DriveAndPath();
 #ifndef __WINS__
-	startFile.Append( _L("EScummVM.exe"));
+	startFile.Append( _L("ScummVM.exe"));
 #else
-	startFile.Append( _L("EScummVM.dll"));
+	startFile.Append( _L("ScummVM.dll"));
 #endif
-	CApaCommandLine* cmdLine=CApaCommandLine::NewLC(startFile);
+	CApaCommandLine *cmdLine = CApaCommandLine::NewLC(startFile);
 	RApaLsSession lsSession;
+
 	lsSession.Connect();
 	CleanupClosePushL(lsSession);
-	lsSession.StartApp(*cmdLine,iThreadId);
-	CleanupStack::PopAndDestroy();//close lsSession
+	lsSession.StartApp(*cmdLine, iThreadId);
+
+	CleanupStack::PopAndDestroy(); // close lsSession
 	CleanupStack::PopAndDestroy(cmdLine);
-	User::After(500000);// Let the application start
+
+	User::After(500000); // Let the application start
+
 	TApaTaskList taskList(iEikonEnv->WsSession());
-	TApaTask myTask=taskList.FindApp(TUid::Uid(0x101f9b57));
+
+	TApaTask myTask = taskList.FindApp(TUid::Uid(0x101f9b57));
 	myTask.SendToBackground();
-	TApaTask exeTask=taskList.FindByPos(0);
-	iExeWgId=exeTask.WgId();
+
+	TApaTask exeTask = taskList.FindByPos(0);
+
+	iExeWgId = exeTask.WgId();
 	exeTask.BringToForeground();
+
 	if(iExeWgId == myTask.WgId()) { // Should n't be the same
 		Exit();
 	}
-	if(iThreadWatch.Open(iThreadId)==KErrNone) {
+	if(iThreadWatch.Open(iThreadId) == KErrNone) {
 		iWatcher = new (ELeave)CScummWatcher;
-		iWatcher->iAppUi=this;
+		iWatcher->iAppUi = this;
 		iThreadWatch.Logon(iWatcher->iStatus);
 	}
 }
 
-CScummWatcher::CScummWatcher():CActive(EPriorityStandard) {
+CScummWatcher::CScummWatcher() : CActive(EPriorityStandard) {
 	CActiveScheduler::Add(this);
-	iStatus=KRequestPending;
+	iStatus = KRequestPending;
 	SetActive();
 }
 
@@ -130,34 +137,31 @@ void CScummWatcher::RunL() {
 
 void CScummVMUi::BringUpEmulatorL() {
 	RThread thread;
-	if(thread.Open(iThreadId)==KErrNone) {
+	if(thread.Open(iThreadId) == KErrNone) {
 		thread.Close();
 		TApaTask apaTask(iEikonEnv->WsSession());
 		apaTask.SetWgId(iExeWgId);
 		apaTask.BringToForeground();
-	}
-	else
-	{
-		iExeWgId=-1;
+	} else {
+		iExeWgId = -1;
 	}
 }
 
 void CScummVMUi::HandleCommandL(TInt aCommand) {
 	switch(aCommand) {
 	case EEikCmdExit:
-	{
-		RThread thread;
-		if(thread.Open(iThreadId)==KErrNone)
 		{
-			thread.Terminate(0);
-			thread.Close();
+			RThread thread;
+			if(thread.Open(iThreadId) == KErrNone) {
+				thread.Terminate(0);
+				thread.Close();
+			}
+			Exit();
 		}
-		Exit();
-	}
-	break;
+		break;
 	}
 }
 
-GLDEF_C  TInt E32Dll(TDllReason) {
+GLDEF_C TInt E32Dll(TDllReason) {
 	return KErrNone;
 }
diff --git a/backends/epoc/build/S80/ScummVMApp.h b/backends/epoc/build/S80/ScummVMApp.h
index 18e4506650..e297d75e9d 100644
--- a/backends/epoc/build/S80/ScummVMApp.h
+++ b/backends/epoc/build/S80/ScummVMApp.h
@@ -31,48 +31,53 @@
 #include <coeview.h>
 #include <eikappui.h>
 
-class CScummVM:public CEikApplication {
+class CScummVM : public CEikApplication {
 public:
 	CScummVM();
 	~CScummVM();
-	CApaDocument* CreateDocumentL();
+
+	CApaDocument *CreateDocumentL();
 	TUid AppDllUid() const;
 };
 
 
 #include <eikdoc.h>
 
-class CScummVMDoc:public  CEikDocument {
+class CScummVMDoc : public CEikDocument {
 public:
+	CScummVMDoc(CEikApplication &aApplicaiton);
 	~CScummVMDoc();
-	CEikAppUi* CreateAppUiL();
+
+	CEikAppUi *CreateAppUiL();
 	void ConstructL();
-	CScummVMDoc(CEikApplication& aApplicaiton);
 };
 
 #include <eikappui.h>
 class CScummVMUi;
-class CScummWatcher:public CActive {
+class CScummWatcher : public CActive {
 public:
 	CScummWatcher();
 	~CScummWatcher();
+
 	void DoCancel();
 	void RunL();
-	CScummVMUi* iAppUi;
+	CScummVMUi *iAppUi;
 };
 
-class CScummVMUi:public CEikAppUi {
+class CScummVMUi : public CEikAppUi {
 public:
 	CScummVMUi();
 	~CScummVMUi();
+
 	void ConstructL();
 	void HandleCommandL(TInt aCommand);
 	void HandleForegroundEventL(TBool aForeground);
 	void BringUpEmulatorL();
+
 private:
 	TThreadId iThreadId;
 	TInt iExeWgId;
 	RThread iThreadWatch;
-	CScummWatcher* iWatcher;
+	CScummWatcher *iWatcher;
 };
 #endif
diff --git a/backends/epoc/build/S90/ScummVMApp.cpp b/backends/epoc/build/S90/ScummVMApp.cpp
index 17804b2efb..1a2c89a4f6 100644
--- a/backends/epoc/build/S90/ScummVMApp.cpp
+++ b/backends/epoc/build/S90/ScummVMApp.cpp
@@ -21,13 +21,14 @@
  * $Header$
  */
 
-#include "ScummVMapp.h"
+#include "backends/epoc/build/S90/ScummVMapp.h"
 #include <escummvms90.rsg>
 #include <apgcli.h>
 #include <eikdll.h>
 #include <apgtask.h>
-EXPORT_C CApaApplication* NewApplication() {
-        return (new CScummVM);
+
+EXPORT_C CApaApplication *NewApplication() {
+	return (new CScummVM);
 }
 
 CScummVM::CScummVM() {
@@ -36,24 +37,22 @@ CScummVM::CScummVM() {
 CScummVM::~CScummVM() {
 }
 
-CApaDocument* CScummVM::CreateDocumentL()
-{
-	return new (ELeave) CScummVMDoc(*this);
+CApaDocument *CScummVM::CreateDocumentL() {
+	return new (ELeave)CScummVMDoc(*this);
 }
 
-TUid CScummVM::AppDllUid() const
-{
+TUid CScummVM::AppDllUid() const {
 	return TUid::Uid(0x101f9b57);
 }
 
-CScummVMDoc::CScummVMDoc(CEikApplication& aApp):CEikDocument(aApp) {
+CScummVMDoc::CScummVMDoc(CEikApplication &aApp) : CEikDocument(aApp) {
 }
 
 CScummVMDoc::~CScummVMDoc() {
 }
 
-CEikAppUi* CScummVMDoc::CreateAppUiL() {
-	return new (ELeave) CScummVMUi;
+CEikAppUi *CScummVMDoc::CreateAppUiL() {
+	return new (ELeave)CScummVMUi;
 }
 
 void CScummVMUi::HandleForegroundEventL(TBool aForeground) {
@@ -70,6 +69,7 @@ CScummVMUi::~CScummVMUi() {
 		iThreadWatch.LogonCancel(iWatcher->iStatus);
 		iWatcher->Cancel();
 	}
+
 	delete iWatcher;
 
 	iThreadWatch.Close();
@@ -84,37 +84,46 @@ void CScummVMUi::ConstructL() {
 
 	startFile = parser.DriveAndPath();
 #ifndef __WINS__
-	startFile.Append( _L("EScummVM.exe"));
+	startFile.Append( _L("ScummVM.exe"));
 #else
-	startFile.Append( _L("EScummVM.dll"));
+	startFile.Append( _L("ScummVM.dll"));
 #endif
-	CApaCommandLine* cmdLine=CApaCommandLine::NewLC(startFile);
+	CApaCommandLine *cmdLine = CApaCommandLine::NewLC(startFile);
 	RApaLsSession lsSession;
+
 	lsSession.Connect();
 	CleanupClosePushL(lsSession);
-	lsSession.StartApp(*cmdLine,iThreadId);
+	lsSession.StartApp(*cmdLine, iThreadId);
+
 	CleanupStack::PopAndDestroy();//close lsSession
 	CleanupStack::PopAndDestroy(cmdLine);
+
 	User::After(500000);// Let the application start
+
 	TApaTaskList taskList(iEikonEnv->WsSession());
-	TApaTask myTask=taskList.FindApp(TUid::Uid(0x101f9b57));
+
+	TApaTask myTask = taskList.FindApp(TUid::Uid(0x101f9b57));
 	myTask.SendToBackground();
-	TApaTask exeTask=taskList.FindByPos(0);
+
+	TApaTask exeTask = taskList.FindByPos(0);
+
 	iExeWgId=exeTask.WgId();
 	exeTask.BringToForeground();
+
 	if(iExeWgId == myTask.WgId()) { // Should n't be the same
 		Exit();
 	}
-	if(iThreadWatch.Open(iThreadId)==KErrNone) {
+	if(iThreadWatch.Open(iThreadId) == KErrNone) {
 		iWatcher = new (ELeave)CScummWatcher;
-		iWatcher->iAppUi=this;
+		iWatcher->iAppUi = this;
 		iThreadWatch.Logon(iWatcher->iStatus);
 	}
 }
 
-CScummWatcher::CScummWatcher():CActive(EPriorityStandard) {
+CScummWatcher::CScummWatcher() : CActive(EPriorityStandard) {
 	CActiveScheduler::Add(this);
-	iStatus=KRequestPending;
+
+	iStatus = KRequestPending;
 	SetActive();
 }
 
@@ -130,34 +139,32 @@ void CScummWatcher::RunL() {
 
 void CScummVMUi::BringUpEmulatorL() {
 	RThread thread;
-	if(thread.Open(iThreadId)==KErrNone) {
+
+	if(thread.Open(iThreadId) == KErrNone) {
 		thread.Close();
 		TApaTask apaTask(iEikonEnv->WsSession());
 		apaTask.SetWgId(iExeWgId);
 		apaTask.BringToForeground();
-	}
-	else
-	{
-		iExeWgId=-1;
+	} else {
+		iExeWgId = -1;
 	}
 }
 
 void CScummVMUi::HandleCommandL(TInt aCommand) {
 	switch(aCommand) {
 	case EEikCmdExit:
-	{
-		RThread thread;
-		if(thread.Open(iThreadId)==KErrNone)
 		{
-			thread.Terminate(0);
-			thread.Close();
+			RThread thread;
+			if(thread.Open(iThreadId) == KErrNone) {
+				thread.Terminate(0);
+				thread.Close();
+			}
+			Exit();
 		}
-		Exit();
-	}
-	break;
+		break;
 	}
 }
 
-GLDEF_C  TInt E32Dll(TDllReason) {
+GLDEF_C TInt E32Dll(TDllReason) {
 	return KErrNone;
 }
diff --git a/backends/epoc/build/S90/ScummVMApp.h b/backends/epoc/build/S90/ScummVMApp.h
index 18e4506650..e297d75e9d 100644
--- a/backends/epoc/build/S90/ScummVMApp.h
+++ b/backends/epoc/build/S90/ScummVMApp.h
@@ -31,48 +31,53 @@
 #include <coeview.h>
 #include <eikappui.h>
 
-class CScummVM:public CEikApplication {
+class CScummVM : public CEikApplication {
 public:
 	CScummVM();
 	~CScummVM();
-	CApaDocument* CreateDocumentL();
+
+	CApaDocument *CreateDocumentL();
 	TUid AppDllUid() const;
 };
 
 
 #include <eikdoc.h>
 
-class CScummVMDoc:public  CEikDocument {
+class CScummVMDoc : public CEikDocument {
 public:
+	CScummVMDoc(CEikApplication &aApplicaiton);
 	~CScummVMDoc();
-	CEikAppUi* CreateAppUiL();
+
+	CEikAppUi *CreateAppUiL();
 	void ConstructL();
-	CScummVMDoc(CEikApplication& aApplicaiton);
 };
 
 #include <eikappui.h>
 class CScummVMUi;
-class CScummWatcher:public CActive {
+class CScummWatcher : public CActive {
 public:
 	CScummWatcher();
 	~CScummWatcher();
+
 	void DoCancel();
 	void RunL();
-	CScummVMUi* iAppUi;
+	CScummVMUi *iAppUi;
 };
 
-class CScummVMUi:public CEikAppUi {
+class CScummVMUi : public CEikAppUi {
 public:
 	CScummVMUi();
 	~CScummVMUi();
+
 	void ConstructL();
 	void HandleCommandL(TInt aCommand);
 	void HandleForegroundEventL(TBool aForeground);
 	void BringUpEmulatorL();
+
 private:
 	TThreadId iThreadId;
 	TInt iExeWgId;
 	RThread iThreadWatch;
-	CScummWatcher* iWatcher;
+	CScummWatcher *iWatcher;
 };
 #endif