aboutsummaryrefslogtreecommitdiff
path: root/backends/epoc
diff options
context:
space:
mode:
authorEugene Sandulenko2005-07-30 21:11:48 +0000
committerEugene Sandulenko2005-07-30 21:11:48 +0000
commit6b4484472b79dc7ea7d1ce545a28fba7d3b7696f (patch)
treec44c4e61f18ddd537f7082cb48869cf33d422fbd /backends/epoc
parent86ab70b149e5cd00cf54f2e41896e2c4e16795e4 (diff)
downloadscummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.tar.gz
scummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.tar.bz2
scummvm-rg350-6b4484472b79dc7ea7d1ce545a28fba7d3b7696f.zip
Remove trailing whitespaces.
svn-id: r18604
Diffstat (limited to 'backends/epoc')
-rw-r--r--backends/epoc/ScummApp.h2
-rw-r--r--backends/epoc/SymbianActions.cpp20
-rw-r--r--backends/epoc/SymbianActions.h2
-rw-r--r--backends/epoc/SymbianOS.cpp26
-rw-r--r--backends/epoc/SymbianOS.h2
-rw-r--r--backends/epoc/build/S60/ScummVMApp.cpp8
-rw-r--r--backends/epoc/build/S80/ScummVMApp.cpp8
-rw-r--r--backends/epoc/build/S90/ScummVMApp.cpp8
-rw-r--r--backends/epoc/portdefs.h6
9 files changed, 41 insertions, 41 deletions
diff --git a/backends/epoc/ScummApp.h b/backends/epoc/ScummApp.h
index eab91c736a..2aa2d6a6b8 100644
--- a/backends/epoc/ScummApp.h
+++ b/backends/epoc/ScummApp.h
@@ -38,7 +38,7 @@ public:
TUid AppDllUid() const;
#ifdef EPOC_AS_APP
- TECompXL iECompXL;
+ TECompXL iECompXL;
#endif
};
#endif
diff --git a/backends/epoc/SymbianActions.cpp b/backends/epoc/SymbianActions.cpp
index 6ec2ed9484..2d347f0c5b 100644
--- a/backends/epoc/SymbianActions.cpp
+++ b/backends/epoc/SymbianActions.cpp
@@ -35,10 +35,10 @@ namespace GUI {
// SumthinWicked says: we either split our Actions like WinCE did with Pocket/Smartphone
// or we put them in this file separated by #ifdefs, this one is up to you, AnotherGuest :)
-
-const Common::String actionNames[] = {
- "Up",
- "Down",
+
+const Common::String actionNames[] = {
+ "Up",
+ "Down",
"Left",
"Right",
"Left Click",
@@ -48,8 +48,8 @@ const Common::String actionNames[] = {
"Zone",
"FT Cheat",
"Swap character",
- "Skip text",
- "Pause",
+ "Skip text",
+ "Pause",
"Quit"
};
@@ -96,7 +96,7 @@ SymbianActions::SymbianActions(GameDetector &detector) :
void SymbianActions::initInstanceMain(OSystem *mainSystem) {
Actions::initInstanceMain(mainSystem);
-
+
// Mouse Up
_action_enabled[ACTION_UP] = true;
@@ -125,7 +125,7 @@ void SymbianActions::initInstanceGame() {
bool is_sky = (_detector->_targetName == "sky");
bool is_queen = (_detector->_targetName == "queen");
bool is_gob = (strncmp(_detector->_targetName.c_str(), "gob", 3) == 0);
-
+
Actions::initInstanceGame();
// See if a right click mapping could be needed
@@ -134,7 +134,7 @@ void SymbianActions::initInstanceGame() {
// Initialize keys for different actions
// Save
- if (is_simon || is_gob)
+ if (is_simon || is_gob)
_action_enabled[ACTION_SAVE] = false;
else
if (is_queen) {
@@ -144,7 +144,7 @@ void SymbianActions::initInstanceGame() {
else
if (is_sky) {
_action_enabled[ACTION_SAVE] = true;
- _key_action[ACTION_SAVE].setAscii(63);
+ _key_action[ACTION_SAVE].setAscii(63);
}
else {
_action_enabled[ACTION_SAVE] = true;
diff --git a/backends/epoc/SymbianActions.h b/backends/epoc/SymbianActions.h
index 9e556a04af..4fef42f96c 100644
--- a/backends/epoc/SymbianActions.h
+++ b/backends/epoc/SymbianActions.h
@@ -70,7 +70,7 @@ public:
private:
SymbianActions(GameDetector &detector);
bool _right_click_needed;
-};
+};
} // namespace GUI
diff --git a/backends/epoc/SymbianOS.cpp b/backends/epoc/SymbianOS.cpp
index ce8722920c..584a2b8018 100644
--- a/backends/epoc/SymbianOS.cpp
+++ b/backends/epoc/SymbianOS.cpp
@@ -53,7 +53,7 @@ OSystem_SDL_Symbian::OSystem_SDL_Symbian() :_channels(0),_stereo_mix_buffer(0)
ConfMan.flushToDisk();
// Initialize global key mapping for Smartphones
GUI::Actions* actions = GUI::Actions::Instance();
- actions->initInstanceMain(this);
+ actions->initInstanceMain(this);
actions->loadMapping();
initZones();
}
@@ -77,14 +77,14 @@ bool OSystem_SDL_Symbian::setGraphicsMode(const char *name) {
}
/*
- * SumthinWicked says: the stuff below is copied from common/scaler.cpp,
+ * SumthinWicked says: the stuff below is copied from common/scaler.cpp,
* so we can skip compiling the scalers. ESDL still needs 1x and the scaler
* architecture because we inherit from OSystem_SDL.
*/
int gBitFormat = 565;
void InitScalers(uint32 BitFormat) {} // called by OSystem_SDL functions, not relevant for ESDL
-
-/**
+
+/**
* Trivial 'scaler' - in fact it doesn't do any scaling but just copies the
* source to the destination.
*/
@@ -100,7 +100,7 @@ void Normal1x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit
bool OSystem_SDL_Symbian::setSoundCallback(SoundProc proc, void *param) {
// First save the proc and param
- _sound_proc_param = param;
+ _sound_proc_param = param;
_sound_proc = proc;
SDL_AudioSpec desired;
SDL_AudioSpec obtained;
@@ -200,12 +200,12 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev,Event &event)
{
if(!GUI::Actions::Instance()->mappingActive() && ev.key.keysym.sym>SDLK_UNKNOWN)
for(TInt loop=0;loop<GUI::ACTION_LAST;loop++){
- if(GUI::Actions::Instance()->getMapping(loop) ==ev.key.keysym.sym &&
+ if(GUI::Actions::Instance()->getMapping(loop) ==ev.key.keysym.sym &&
GUI::Actions::Instance()->isEnabled(loop)){
// Create proper event instead
switch(loop)
{
- case GUI::ACTION_UP:
+ case GUI::ACTION_UP:
if(ev.type == SDL_KEYDOWN)
{
_km.y_vel = -1;
@@ -218,7 +218,7 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev,Event &event)
}
event.type = EVENT_MOUSEMOVE;
fillMouseEvent(event, _km.x, _km.y);
- return true;
+ return true;
case GUI::ACTION_DOWN:
if(ev.type == SDL_KEYDOWN)
{
@@ -232,7 +232,7 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev,Event &event)
}
event.type = EVENT_MOUSEMOVE;
fillMouseEvent(event, _km.x, _km.y);
- return true;
+ return true;
case GUI::ACTION_LEFT:
if(ev.type == SDL_KEYDOWN)
{
@@ -272,8 +272,8 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev,Event &event)
case GUI::ACTION_ZONE:
if(ev.type == SDL_KEYDOWN)
{
- int i;
-
+ int i;
+
for (i=0; i<TOTAL_ZONES; i++)
if (_km.x >= _zones[i].x && _km.y >= _zones[i].y &&
_km.x <= _zones[i].x + _zones[i].width && _km.y <= _zones[i].y + _zones[i].height
@@ -287,7 +287,7 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev,Event &event)
_currentZone = 0;
event.type = EVENT_MOUSEMOVE;
fillMouseEvent(event, _mouseXZone[_currentZone],_mouseYZone[_currentZone]);
- SDL_WarpMouse(event.mouse.x,event.mouse.y);
+ SDL_WarpMouse(event.mouse.x,event.mouse.y);
}
return true;
case GUI::ACTION_SAVE:
@@ -301,7 +301,7 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev,Event &event)
ev.key.keysym.scancode= key.keycode();
ev.key.keysym.mod =(SDLMod) key.flags();
return false;
- }
+ }
case GUI::ACTION_QUIT:{
GUI::MessageDialog alert("Do you want to quit ?", "Yes", "No");
if (alert.runModal() == GUI::kMessageOK)
diff --git a/backends/epoc/SymbianOS.h b/backends/epoc/SymbianOS.h
index 5f281cfd3b..ff470744df 100644
--- a/backends/epoc/SymbianOS.h
+++ b/backends/epoc/SymbianOS.h
@@ -36,7 +36,7 @@ public:
const OSystem::GraphicsMode *getSupportedGraphicsModes() const;
bool setGraphicsMode(const char *name);
- // Set function that generates samples
+ // Set function that generates samples
/**
* This function is overridden by the symbian port in order to provide MONO audio
* downmix is done by supplying our own audiocallback
diff --git a/backends/epoc/build/S60/ScummVMApp.cpp b/backends/epoc/build/S60/ScummVMApp.cpp
index 93a28694c3..ad1e2a75cc 100644
--- a/backends/epoc/build/S60/ScummVMApp.cpp
+++ b/backends/epoc/build/S60/ScummVMApp.cpp
@@ -58,7 +58,7 @@ CEikAppUi* CScummVMDoc::CreateAppUiL() {
void CScummVMUi::HandleForegroundEventL(TBool aForeground) {
if(aForeground) {
- BringUpEmulatorL();
+ BringUpEmulatorL();
}
}
@@ -81,7 +81,7 @@ void CScummVMUi::ConstructL() {
startFile = iEikonEnv->EikAppUi()->Application()->AppFullName();
TParse parser;
parser.Set(startFile,NULL,NULL);
-
+
startFile = parser.DriveAndPath();
#ifndef __WINS__
startFile.Append( _L("EScummVM.exe"));
@@ -109,7 +109,7 @@ void CScummVMUi::ConstructL() {
if(iThreadWatch.Open(iThreadId)==KErrNone) {
iWatcher = new (ELeave)CScummWatcher;
iWatcher->iAppUi=this;
- iThreadWatch.Logon(iWatcher->iStatus);
+ iThreadWatch.Logon(iWatcher->iStatus);
}
}
@@ -154,7 +154,7 @@ void CScummVMUi::HandleCommandL(TInt aCommand) {
thread.Close();
}
Exit();
- }
+ }
break;
}
}
diff --git a/backends/epoc/build/S80/ScummVMApp.cpp b/backends/epoc/build/S80/ScummVMApp.cpp
index f0e0860216..eae9c35f56 100644
--- a/backends/epoc/build/S80/ScummVMApp.cpp
+++ b/backends/epoc/build/S80/ScummVMApp.cpp
@@ -58,7 +58,7 @@ CEikAppUi* CScummVMDoc::CreateAppUiL() {
void CScummVMUi::HandleForegroundEventL(TBool aForeground) {
if(aForeground) {
- BringUpEmulatorL();
+ BringUpEmulatorL();
}
}
@@ -81,7 +81,7 @@ void CScummVMUi::ConstructL() {
startFile = iEikonEnv->EikAppUi()->Application()->AppFullName();
TParse parser;
parser.Set(startFile,NULL,NULL);
-
+
startFile = parser.DriveAndPath();
#ifndef __WINS__
startFile.Append( _L("EScummVM.exe"));
@@ -108,7 +108,7 @@ void CScummVMUi::ConstructL() {
if(iThreadWatch.Open(iThreadId)==KErrNone) {
iWatcher = new (ELeave)CScummWatcher;
iWatcher->iAppUi=this;
- iThreadWatch.Logon(iWatcher->iStatus);
+ iThreadWatch.Logon(iWatcher->iStatus);
}
}
@@ -153,7 +153,7 @@ void CScummVMUi::HandleCommandL(TInt aCommand) {
thread.Close();
}
Exit();
- }
+ }
break;
}
}
diff --git a/backends/epoc/build/S90/ScummVMApp.cpp b/backends/epoc/build/S90/ScummVMApp.cpp
index 95ab6d3b84..ed8a92dda9 100644
--- a/backends/epoc/build/S90/ScummVMApp.cpp
+++ b/backends/epoc/build/S90/ScummVMApp.cpp
@@ -58,7 +58,7 @@ CEikAppUi* CScummVMDoc::CreateAppUiL() {
void CScummVMUi::HandleForegroundEventL(TBool aForeground) {
if(aForeground) {
- BringUpEmulatorL();
+ BringUpEmulatorL();
}
}
@@ -81,7 +81,7 @@ void CScummVMUi::ConstructL() {
startFile = iEikonEnv->EikAppUi()->Application()->AppFullName();
TParse parser;
parser.Set(startFile,NULL,NULL);
-
+
startFile = parser.DriveAndPath();
#ifndef __WINS__
startFile.Append( _L("EScummVM.exe"));
@@ -108,7 +108,7 @@ void CScummVMUi::ConstructL() {
if(iThreadWatch.Open(iThreadId)==KErrNone) {
iWatcher = new (ELeave)CScummWatcher;
iWatcher->iAppUi=this;
- iThreadWatch.Logon(iWatcher->iStatus);
+ iThreadWatch.Logon(iWatcher->iStatus);
}
}
@@ -153,7 +153,7 @@ void CScummVMUi::HandleCommandL(TInt aCommand) {
thread.Close();
}
Exit();
- }
+ }
break;
}
}
diff --git a/backends/epoc/portdefs.h b/backends/epoc/portdefs.h
index 2f993c7e4e..4bcf1a56ca 100644
--- a/backends/epoc/portdefs.h
+++ b/backends/epoc/portdefs.h
@@ -65,14 +65,14 @@
// somehow nobody has this function...
#define hypot(a, b) sqrt((a)*(a) + (b)*(b))
-// Symbian bsearch implementation is flawed
+// Symbian bsearch implementation is flawed
void inline *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) {
size_t i;
- for (i=0; i<nmemb; i++)
+ for (i=0; i<nmemb; i++)
if (compar(key, (void*)((size_t)base + size * i)) == 0)
return (void*)((size_t)base + size * i);
return NULL;
}
#define bsearch scumm_bsearch
-
+