diff options
| author | Max Horn | 2011-06-20 00:59:48 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-20 00:59:48 +0200 |
| commit | 88913c0139ac6d1dfb356d3048702b7bc8ef4079 (patch) | |
| tree | a7436d20333c28f87f2ed0bc15c743b5eb8144ee /common | |
| parent | 3853e76202b132e769ae149720eca931cd87104a (diff) | |
| download | scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.tar.gz scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.tar.bz2 scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.zip | |
ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'common')
| -rw-r--r-- | common/config-manager.h | 2 | ||||
| -rw-r--r-- | common/ptr.h | 2 | ||||
| -rw-r--r-- | common/quicktime.cpp | 4 | ||||
| -rw-r--r-- | common/winexe_ne.cpp | 2 | ||||
| -rw-r--r-- | common/winexe_pe.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/common/config-manager.h b/common/config-manager.h index 6f3f554459..78a62b9808 100644 --- a/common/config-manager.h +++ b/common/config-manager.h @@ -147,7 +147,7 @@ public: static void defragment(); // move in memory to reduce fragmentation void copyFrom(ConfigManager &source); - + private: friend class Singleton<SingletonBaseType>; ConfigManager(); diff --git a/common/ptr.h b/common/ptr.h index e0d026f964..fc272d3d41 100644 --- a/common/ptr.h +++ b/common/ptr.h @@ -240,7 +240,7 @@ public: operator bool() const { return _pointer != 0; } ~ScopedPtr() { - delete _pointer; + delete _pointer; } /** diff --git a/common/quicktime.cpp b/common/quicktime.cpp index 57534b301a..ee49b092a4 100644 --- a/common/quicktime.cpp +++ b/common/quicktime.cpp @@ -728,7 +728,7 @@ int QuickTimeParser::readESDS(Atom atom) { byte tag; int length; - + readMP4Desc(_fd, tag, length); _fd->readUint16BE(); // id if (tag == kMP4ESDescTag) @@ -736,7 +736,7 @@ int QuickTimeParser::readESDS(Atom atom) { // Check if we've got the Config MPEG-4 header readMP4Desc(_fd, tag, length); - if (tag != kMP4DecConfigDescTag) + if (tag != kMP4DecConfigDescTag) return 0; track->objectTypeMP4 = _fd->readByte(); diff --git a/common/winexe_ne.cpp b/common/winexe_ne.cpp index 80266ba87e..8690f6795b 100644 --- a/common/winexe_ne.cpp +++ b/common/winexe_ne.cpp @@ -136,7 +136,7 @@ bool NEResources::loadFromCompressedEXE(const String &fileName) { matchPos &= 0xFFF; } } - + } } diff --git a/common/winexe_pe.h b/common/winexe_pe.h index cc1d0c9770..b38f2f78f5 100644 --- a/common/winexe_pe.h +++ b/common/winexe_pe.h @@ -107,7 +107,7 @@ private: uint32 offset; uint32 size; }; - + typedef HashMap<WinResourceID, Resource, WinResourceID_Hash, WinResourceID_EqualTo> LangMap; typedef HashMap<WinResourceID, LangMap, WinResourceID_Hash, WinResourceID_EqualTo> NameMap; typedef HashMap<WinResourceID, NameMap, WinResourceID_Hash, WinResourceID_EqualTo> TypeMap; |