[Scummvm-cvs-logs] CVS: scummvm/backends/epoc/build/S60 ScummVMApp.cpp,1.4,1.5 ScummVMApp.h,1.2,1.3
Eugene Sandulenko
sev at users.sourceforge.net
Sat Dec 3 06:35:01 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/epoc/build/S90 ScummVMApp.cpp,1.3,1.4 ScummVMApp.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/epoc ScummApp.cpp,1.3,1.4 ScummApp.h,1.4,1.5 SymbianActions.cpp,1.4,1.5 SymbianActions.h,1.3,1.4 SymbianOS.cpp,1.5,1.6 SymbianOS.h,1.4,1.5 portdefs.h,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/epoc/build/S60
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20945/build/S60
Modified Files:
ScummVMApp.cpp ScummVMApp.h
Log Message:
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.
Index: ScummVMApp.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/S60/ScummVMApp.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ScummVMApp.cpp 18 Oct 2005 01:30:11 -0000 1.4
+++ ScummVMApp.cpp 3 Dec 2005 14:34:45 -0000 1.5
@@ -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() {
}
-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 @@
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 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;
}
Index: ScummVMApp.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/S60/ScummVMApp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ScummVMApp.h 18 Oct 2005 01:30:11 -0000 1.2
+++ ScummVMApp.h 3 Dec 2005 14:34:45 -0000 1.3
@@ -36,7 +36,8 @@
public:
CScummVM();
~CScummVM();
- CApaDocument* CreateDocumentL();
+
+ CApaDocument *CreateDocumentL();
TUid AppDllUid() const;
};
@@ -45,35 +46,39 @@
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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/epoc/build/S90 ScummVMApp.cpp,1.3,1.4 ScummVMApp.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/epoc ScummApp.cpp,1.3,1.4 ScummApp.h,1.4,1.5 SymbianActions.cpp,1.4,1.5 SymbianActions.h,1.3,1.4 SymbianOS.cpp,1.5,1.6 SymbianOS.h,1.4,1.5 portdefs.h,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list