diff options
author | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2008-01-28 00:14:17 +0000 |
commit | d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd (patch) | |
tree | e6e98f266610f6428c248aed6abc75e637e45231 /common | |
parent | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (diff) | |
download | scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.gz scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.tar.bz2 scummvm-rg350-d6c34bdc4b12ea7bef445ef4d84bf8a5370c02dd.zip |
Fixed the spaces before tabs.
svn-id: r30667
Diffstat (limited to 'common')
-rw-r--r-- | common/events.h | 16 | ||||
-rw-r--r-- | common/file.cpp | 36 | ||||
-rw-r--r-- | common/iff_container.h | 6 | ||||
-rw-r--r-- | common/rect.h | 4 | ||||
-rw-r--r-- | common/str.h | 4 | ||||
-rw-r--r-- | common/util.cpp | 4 | ||||
-rw-r--r-- | common/util.h | 14 |
7 files changed, 42 insertions, 42 deletions
diff --git a/common/events.h b/common/events.h index 6e6485f184..55392fc7db 100644 --- a/common/events.h +++ b/common/events.h @@ -78,24 +78,24 @@ enum EventType { * Implementation wise, we might want to use the classic * union-of-structs trick. It goes roughly like this: * struct BasicEvent { - * EventType type; + * EventType type; * }; * struct MouseMovedEvent : BasicEvent { - * Common::Point pos; + * Common::Point pos; * }; * struct MouseButtonEvent : MouseMovedEvent { - * int button; + * int button; * }; * struct KeyEvent : BasicEvent { - * ... + * ... * }; * ... * union Event { * EventType type; - * MouseMovedEvent mouse; - * MouseButtonEvent button; - * KeyEvent key; - * ... + * MouseMovedEvent mouse; + * MouseButtonEvent button; + * KeyEvent key; + * ... * }; */ struct Event { diff --git a/common/file.cpp b/common/file.cpp index 3ddd3d2cc5..ccfeb5f322 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -77,18 +77,18 @@ #include "backends/fs/ds/ds-fs.h" - //void std_fprintf(FILE* handle, const char* fmt, ...); // used in common/util.cpp - //void std_fflush(FILE* handle); // used in common/util.cpp + //void std_fprintf(FILE* handle, const char* fmt, ...); // used in common/util.cpp + //void std_fflush(FILE* handle); // used in common/util.cpp - //char* std_fgets(char* str, int size, FILE* file); // not used - //int std_getc(FILE* handle); // not used - //char* std_getcwd(char* dir, int dunno); // not used - //void std_cwd(char* dir); // not used - //int std_ferror(FILE* handle); // not used + //char* std_fgets(char* str, int size, FILE* file); // not used + //int std_getc(FILE* handle); // not used + //char* std_getcwd(char* dir, int dunno); // not used + //void std_cwd(char* dir); // not used + //int std_ferror(FILE* handle); // not used // Only functions used in the ScummVM source have been defined here! - #define fopen(name, mode) DS::std_fopen(name, mode) - #define fclose(handle) DS::std_fclose(handle) + #define fopen(name, mode) DS::std_fopen(name, mode) + #define fclose(handle) DS::std_fclose(handle) #define fread(ptr, size, items, file) DS::std_fread(ptr, size, items, file) #define fwrite(ptr, size, items, file) DS::std_fwrite(ptr, size, items, file) #define feof(handle) DS::std_feof(handle) @@ -114,18 +114,18 @@ #define FILE void - FILE* symbian_fopen(const char* name, const char* mode); - void symbian_fclose(FILE* handle); - size_t symbian_fread(const void* ptr, size_t size, size_t numItems, FILE* handle); - size_t symbian_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle); - bool symbian_feof(FILE* handle); + FILE* symbian_fopen(const char* name, const char* mode); + void symbian_fclose(FILE* handle); + size_t symbian_fread(const void* ptr, size_t size, size_t numItems, FILE* handle); + size_t symbian_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle); + bool symbian_feof(FILE* handle); long int symbian_ftell(FILE* handle); - int symbian_fseek(FILE* handle, long int offset, int whence); - void symbian_clearerr(FILE* handle); + int symbian_fseek(FILE* handle, long int offset, int whence); + void symbian_clearerr(FILE* handle); // Only functions used in the ScummVM source have been defined here! - #define fopen(name, mode) symbian_fopen(name, mode) - #define fclose(handle) symbian_fclose(handle) + #define fopen(name, mode) symbian_fopen(name, mode) + #define fclose(handle) symbian_fclose(handle) #define fread(ptr, size, items, file) symbian_fread(ptr, size, items, file) #define fwrite(ptr, size, items, file) symbian_fwrite(ptr, size, items, file) #define feof(handle) symbian_feof(handle) diff --git a/common/iff_container.h b/common/iff_container.h index 10175d42e9..9d477276fc 100644 --- a/common/iff_container.h +++ b/common/iff_container.h @@ -218,11 +218,11 @@ public: return &_chunk; } - IFF_ID _typeId; + IFF_ID _typeId; protected: - IFFChunk _formChunk; - IFFChunk _chunk; + IFFChunk _formChunk; + IFFChunk _chunk; }; } // namespace Common diff --git a/common/rect.h b/common/rect.h index 2230111538..d88f400039 100644 --- a/common/rect.h +++ b/common/rect.h @@ -31,7 +31,7 @@ namespace Common { -/*! @brief simple class for handling both 2D position and size +/*! @brief simple class for handling both 2D position and size This small class is an helper for position and size values. */ @@ -65,7 +65,7 @@ struct Point { } }; -/*! @brief simple class for handling a rectangular zone. +/*! @brief simple class for handling a rectangular zone. This small class is an helper for rectangles. Note: This implementation is built around the assumption that (top,left) is diff --git a/common/str.h b/common/str.h index f19ad4e606..d42320f2d9 100644 --- a/common/str.h +++ b/common/str.h @@ -61,7 +61,7 @@ protected: * a lot. Yes, we limit ourselves to strings shorter than 4GB -- * on purpose :-). */ - uint32 _len; + uint32 _len; /** * Pointer to the actual string storage. Either points to _storage, @@ -81,7 +81,7 @@ protected: */ struct { mutable int *_refCount; - uint32 _capacity; + uint32 _capacity; } _extern; }; diff --git a/common/util.cpp b/common/util.cpp index 6b2e16ee88..19f506cf6e 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -53,8 +53,8 @@ extern bool isSmartphone(void); #define stderr ((DS::fileHandle*) -2) #define stdin ((DS::fileHandle*) -3) - void std_fprintf(FILE* handle, const char* fmt, ...); - void std_fflush(FILE* handle); + void std_fprintf(FILE* handle, const char* fmt, ...); + void std_fflush(FILE* handle); #define fprintf(file, fmt, ...) { char str[128]; sprintf(str, fmt, ##__VA_ARGS__); DS::std_fwrite(str, strlen(str), 1, file); } #define fflush(file) DS::std_fflush(file) diff --git a/common/util.h b/common/util.h index 979f98bf4c..05e821eb01 100644 --- a/common/util.h +++ b/common/util.h @@ -57,15 +57,15 @@ namespace Common { * Taken from exult/files/listfiles.cc * * Token meaning: - * "*": any character, any amount of times. - * "?": any character, only once. + * "*": any character, any amount of times. + * "?": any character, only once. * * Example strings/patterns: - * String: monkey.s?? Pattern: monkey.s01 => true - * String: monkey.s?? Pattern: monkey.s101 => false - * String: monkey.s?1 Pattern: monkey.s99 => false - * String: monkey.s* Pattern: monkey.s101 => true - * String: monkey.s*1 Pattern: monkey.s99 => false + * String: monkey.s?? Pattern: monkey.s01 => true + * String: monkey.s?? Pattern: monkey.s101 => false + * String: monkey.s?1 Pattern: monkey.s99 => false + * String: monkey.s* Pattern: monkey.s101 => true + * String: monkey.s*1 Pattern: monkey.s99 => false * * @param str Text to be matched against the given pattern. * @param pat Glob pattern. |