diff options
author | Eugene Sandulenko | 2009-01-01 15:06:43 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2009-01-01 15:06:43 +0000 |
commit | 696897b0583ad52ebc6f7666525277847619a8ce (patch) | |
tree | 5ac2be2991e94dce32c5bb7fdb0dcc4188221503 /backends/platform/symbian | |
parent | 05d3633eb32ead8e11435b85a9db1ddaa1482fcb (diff) | |
download | scummvm-rg350-696897b0583ad52ebc6f7666525277847619a8ce.tar.gz scummvm-rg350-696897b0583ad52ebc6f7666525277847619a8ce.tar.bz2 scummvm-rg350-696897b0583ad52ebc6f7666525277847619a8ce.zip |
Whoa! Removing trailing spaces.
svn-id: r35648
Diffstat (limited to 'backends/platform/symbian')
-rw-r--r-- | backends/platform/symbian/src/SymbianActions.cpp | 2 | ||||
-rw-r--r-- | backends/platform/symbian/src/SymbianOS.cpp | 10 | ||||
-rw-r--r-- | backends/platform/symbian/src/vsnprintf.h | 38 |
3 files changed, 25 insertions, 25 deletions
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp index e71b242329..6ad6ff75ce 100644 --- a/backends/platform/symbian/src/SymbianActions.cpp +++ b/backends/platform/symbian/src/SymbianActions.cpp @@ -178,7 +178,7 @@ void SymbianActions::initInstanceGame() { // Skip text if (!is_cine && !is_parallaction) _action_enabled[ACTION_SKIP_TEXT] = true; - if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || + if (is_simon || is_sky || is_sword2 || is_queen || is_sword1 || is_gob || is_saga || is_kyra || is_touche || is_lure || is_feeble || is_drascula) _key_action[ACTION_SKIP_TEXT].setKey(Common::KEYCODE_ESCAPE, Common::KEYCODE_ESCAPE); // Escape key else { diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index 254b716927..251ba2c48e 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -25,7 +25,7 @@ #include <eikenv.h> // for CEikonEnv::Static() @ Symbian::FatalError() #include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath() #include <bautils.h> - + #include "backends/fs/symbian/symbian-fs-factory.h" #include "backends/platform/symbian/src/SymbianOS.h" #include "backends/platform/symbian/src/SymbianActions.h" @@ -156,7 +156,7 @@ void OSystem_SDL_Symbian::initBackend() { // If savepath has not already been set then set it if (!ConfMan.hasKey("savepath")) { ConfMan.set("savepath", savePath); - + } // Ensure that the current set path (might have been altered by the user) exists @@ -164,7 +164,7 @@ void OSystem_SDL_Symbian::initBackend() { TFileName fname; TPtrC8 ptr((const unsigned char*)currentPath.c_str(),currentPath.size()); fname.Copy(ptr); - BaflUtils::EnsurePathExistsL(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), fname); + BaflUtils::EnsurePathExistsL(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), fname); ConfMan.setBool("FM_high_quality", false); #if !defined(S60) || defined(S60V3) // S60 has low quality as default @@ -268,12 +268,12 @@ void OSystem_SDL_Symbian::setupMixer() { // even if it didn't. Probably only happens for "weird" rates, though. _samplesPerSec = obtained.freq; _channels = obtained.channels; - + // Need to create mixbuffer for stereo mix to downmix if (_channels != 2) { _stereo_mix_buffer = new byte [obtained.size*2];//*2 for stereo values } - + // Tell the mixer that we are ready and start the sound processing _mixer->setOutputRate(_samplesPerSec); _mixer->setReady(true); diff --git a/backends/platform/symbian/src/vsnprintf.h b/backends/platform/symbian/src/vsnprintf.h index 5ed04b1980..5a9c836ea3 100644 --- a/backends/platform/symbian/src/vsnprintf.h +++ b/backends/platform/symbian/src/vsnprintf.h @@ -1,9 +1,9 @@ /* - * This is the vsnprintf for scummvm/symbian implementation from the original snprintf.c, + * This is the vsnprintf for scummvm/symbian implementation from the original snprintf.c, * all support functions has been removed and vsnprintf renamed to symbian_vsnprintf * snprintf.c - a portable implementation of snprintf * According to the homepage this function could be licensed as either Frontier Aritistic or GPL. - * + * * AUTHOR * Mark Martinec <mark.martinec@ijs.si>, April 1999. * @@ -230,14 +230,14 @@ static char credits[] = "\n\ @(#)snprintf.c, v2.2: Copyright 1999, Mark Martinec. Frontier Artistic License applies.\n\ @(#)snprintf.c, v2.2: http://www.ijs.si/software/snprintf/\n"; int symbian_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { - + size_t str_l = 0; const char *p = fmt; - + /* In contrast with POSIX, the ISO C99 now says * that str can be NULL and str_m can be 0. * This is more useful than the old: if (str_m < 1) return -1; */ - + if (!p) p = ""; while (*p) { if (*p != '%') { @@ -260,7 +260,7 @@ int symbian_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { the ' ' flag should be ignored. */ char length_modifier = '\0'; /* allowed values: \0, h, l, L */ char tmp[32];/* temporary buffer for simple numeric->string conversion */ - + const char *str_arg; /* string address in case of string argument */ size_t str_arg_l; /* natural field width of arg without padding and sign */ @@ -268,17 +268,17 @@ int symbian_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { /* unsigned char argument value - only defined for c conversion. N.B. standard explicitly states the char argument for the c conversion is unsigned */ - + size_t number_of_zeros_to_pad = 0; /* number of zeros to be inserted for numeric conversions as required by the precision or minimal field width */ - + size_t zero_padding_insertion_ind = 0; /* index into tmp where zero padding is to be inserted */ - + char fmt_spec = '\0'; /* current conversion specifier character */ - + str_arg = credits;/* just to make compiler happy (defined but not used)*/ str_arg = NULL; starting_p = p; p++; /* skip '%' */ @@ -298,7 +298,7 @@ int symbian_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { p++; } /* If the '0' and '-' flags both appear, the '0' flag should be ignored. */ - + /* parse field width */ if (*p == '*') { int j; @@ -397,21 +397,21 @@ int symbian_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { case 'd': case 'u': case 'o': case 'x': case 'X': case 'p': { /* NOTE: the u, o, x, X and p conversion specifiers imply the value is unsigned; d implies a signed value */ - + int arg_sign = 0; /* 0 if numeric argument is zero (or if pointer is NULL for 'p'), +1 if greater than zero (or nonzero for unsigned arguments), -1 if negative (unsigned argument is never negative) */ - + int int_arg = 0; unsigned int uint_arg = 0; /* only defined for length modifier h, or for no length modifiers */ - + long int long_arg = 0; unsigned long int ulong_arg = 0; /* only defined for length modifier l */ - + void *ptr_arg = NULL; /* pointer argument value -only defined for p conversion */ - + #ifdef SNPRINTF_LONGLONG_SUPPORT long long int long_long_arg = 0; unsigned long long int ulong_long_arg = 0; @@ -554,7 +554,7 @@ int symbian_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { } } /* zero padding to specified precision? */ - if (num_of_digits < precision) + if (num_of_digits < precision) number_of_zeros_to_pad = precision - num_of_digits; } /* zero padding to specified minimal field width? */ @@ -659,10 +659,10 @@ int symbian_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { int symbian_snprintf(char *text, size_t maxlen, const char *fmt, ...) { va_list ap; int retval; - + va_start(ap, fmt); retval = symbian_vsnprintf(text, maxlen, fmt, ap); va_end(ap); - + return retval; } |