From b49e6eb96f5d921aad52bb33a7825622f0e67676 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 15 Apr 2021 23:16:21 +0300 Subject: [PATCH] JANITORIAL: Fix some excess tabs --- audio/adlib.cpp | 2 +- audio/audiostream.cpp | 8 +-- audio/decoders/ac3.cpp | 2 +- backends/audiocd/sdl/sdl-audiocd.cpp | 6 +-- .../events/symbiansdl/symbiansdl-events.cpp | 6 +-- backends/platform/psp/thread.cpp | 50 +++++++++---------- backends/vkeybd/virtual-keyboard.cpp | 14 +++--- common/ustr.h | 4 +- engines/glk/hugo/heexpr.cpp | 2 +- engines/glk/hugo/hemisc.cpp | 4 +- engines/glk/hugo/heobject.cpp | 4 +- 11 files changed, 51 insertions(+), 51 deletions(-) diff --git a/audio/adlib.cpp b/audio/adlib.cpp index dc48c74f911..0d6bdec5c5e 100644 --- a/audio/adlib.cpp +++ b/audio/adlib.cpp @@ -1405,7 +1405,7 @@ MidiDriver_ADLIB::MidiDriver_ADLIB() { _timerThreshold = 0x411B; _opl = 0; _adlibTimerProc = 0; - _adlibTimerParam = 0; + _adlibTimerParam = 0; _isOpen = false; } diff --git a/audio/audiostream.cpp b/audio/audiostream.cpp index 7c8b01464c5..2feadcab589 100644 --- a/audio/audiostream.cpp +++ b/audio/audiostream.cpp @@ -472,10 +472,10 @@ AudioStream *makeLimitingAudioStream(AudioStream *parentStream, const Timestamp */ class NullAudioStream : public AudioStream { public: - bool isStereo() const { return false; } - int getRate() const; - int readBuffer(int16 *data, const int numSamples) { return 0; } - bool endOfData() const { return true; } + bool isStereo() const { return false; } + int getRate() const; + int readBuffer(int16 *data, const int numSamples) { return 0; } + bool endOfData() const { return true; } }; int NullAudioStream::getRate() const { diff --git a/audio/decoders/ac3.cpp b/audio/decoders/ac3.cpp index aa06f710191..eb25fb26455 100644 --- a/audio/decoders/ac3.cpp +++ b/audio/decoders/ac3.cpp @@ -82,7 +82,7 @@ bool AC3Stream::init(Common::SeekableReadStream &firstPacket) { deinit(); // In theory, I should pass mm_accel() to a52_init(), but I don't know - // where that's supposed to be defined. + // where that's supposed to be defined. _a52State = a52_init(0); // Go through the header to find sync diff --git a/backends/audiocd/sdl/sdl-audiocd.cpp b/backends/audiocd/sdl/sdl-audiocd.cpp index 149e4139a9f..2058044c1a7 100644 --- a/backends/audiocd/sdl/sdl-audiocd.cpp +++ b/backends/audiocd/sdl/sdl-audiocd.cpp @@ -77,10 +77,10 @@ void SdlAudioCDManager::close() { DefaultAudioCDManager::close(); if (_cdrom) { - SDL_CDStop(_cdrom); - SDL_CDClose(_cdrom); + SDL_CDStop(_cdrom); + SDL_CDClose(_cdrom); _cdrom = 0; - } + } } void SdlAudioCDManager::stop() { diff --git a/backends/events/symbiansdl/symbiansdl-events.cpp b/backends/events/symbiansdl/symbiansdl-events.cpp index a44025cc891..7f4b6fe7029 100644 --- a/backends/events/symbiansdl/symbiansdl-events.cpp +++ b/backends/events/symbiansdl/symbiansdl-events.cpp @@ -34,9 +34,9 @@ #define JOY_DEADZONE 3200 SymbianSdlEventSource::zoneDesc SymbianSdlEventSource::_zones[TOTAL_ZONES] = { - { 0, 0, 320, 145 }, - { 0, 145, 150, 55 }, - { 150, 145, 170, 55 } + { 0, 0, 320, 145 }, + { 0, 145, 150, 55 }, + { 150, 145, 170, 55 } }; SymbianSdlEventSource::SymbianSdlEventSource() diff --git a/backends/platform/psp/thread.cpp b/backends/platform/psp/thread.cpp index 22d294e05a3..74f8698ba46 100644 --- a/backends/platform/psp/thread.cpp +++ b/backends/platform/psp/thread.cpp @@ -193,38 +193,38 @@ bool PspMutex::unlock() { // Release all threads waiting on the condition void PspCondition::releaseAll() { - _mutex.lock(); - if (_waitingThreads > _signaledThreads) { // we have signals to issue - int numWaiting = _waitingThreads - _signaledThreads; // threads we haven't signaled - _signaledThreads = _waitingThreads; + _mutex.lock(); + if (_waitingThreads > _signaledThreads) { // we have signals to issue + int numWaiting = _waitingThreads - _signaledThreads; // threads we haven't signaled + _signaledThreads = _waitingThreads; - _waitSem.give(numWaiting); - _mutex.unlock(); - for (int i=0; i 0 ) { - _doneSem.give(); // let the thread know - _signaledThreads--; - } - _waitingThreads--; - _mutex.unlock(); + // let the signaling thread know we're done + _mutex.lock(); + if (_signaledThreads > 0 ) { + _doneSem.give(); // let the thread know + _signaledThreads--; + } + _waitingThreads--; + _mutex.unlock(); - externalMutex.lock(); // must lock external mutex here for continuation + externalMutex.lock(); // must lock external mutex here for continuation } diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp index 3d010e2b9d0..bd014d7a0b2 100644 --- a/backends/vkeybd/virtual-keyboard.cpp +++ b/backends/vkeybd/virtual-keyboard.cpp @@ -227,16 +227,16 @@ void VirtualKeyboard::handleMouseUp(int16 x, int16 y) { // If no GUI opened before the virtual keyboard, kKeymapTypeGui is not yet initialized // Check and do it if needed void VirtualKeyboard::initKeymap() { - using namespace Common; + using namespace Common; - Keymapper *mapper = _system->getEventManager()->getKeymapper(); + Keymapper *mapper = _system->getEventManager()->getKeymapper(); - // Do not try to recreate same keymap over again - if (mapper->getKeymap(kGuiKeymapName) != 0) - return; + // Do not try to recreate same keymap over again + if (mapper->getKeymap(kGuiKeymapName) != 0) + return; - Keymap *guiMap = g_gui.getKeymap(); - mapper->addGlobalKeymap(guiMap); + Keymap *guiMap = g_gui.getKeymap(); + mapper->addGlobalKeymap(guiMap); } void VirtualKeyboard::show() { diff --git a/common/ustr.h b/common/ustr.h index b5b7024856e..83559f5adcb 100644 --- a/common/ustr.h +++ b/common/ustr.h @@ -186,9 +186,9 @@ public: private: void decodeInternal(const char *str, uint32 len, CodePage page); void decodeOneByte(const char *str, uint32 len, CodePage page); - void decodeWindows932(const char *src, uint32 len); + void decodeWindows932(const char *src, uint32 len); void decodeWindows949(const char *src, uint32 len); - void decodeWindows950(const char *src, uint32 len); + void decodeWindows950(const char *src, uint32 len); void decodeUTF8(const char *str, uint32 len); friend class String; diff --git a/engines/glk/hugo/heexpr.cpp b/engines/glk/hugo/heexpr.cpp index 06e8d82c0d2..604fa7f6ca2 100644 --- a/engines/glk/hugo/heexpr.cpp +++ b/engines/glk/hugo/heexpr.cpp @@ -318,7 +318,7 @@ int Hugo::GetVal() { break; } #endif - val = CallRoutine(routineaddr); + val = CallRoutine(routineaddr); break; } diff --git a/engines/glk/hugo/hemisc.cpp b/engines/glk/hugo/hemisc.cpp index 47cd6c46350..224d8a10448 100644 --- a/engines/glk/hugo/hemisc.cpp +++ b/engines/glk/hugo/hemisc.cpp @@ -690,7 +690,7 @@ void Hugo::FatalError(int n) { #if defined (DEBUGGER) if (routines > 0) - { + { SwitchtoDebugger(); if (n==MEMORY_E) DebuggerFatal(D_MEMORY_ERROR); @@ -1331,7 +1331,7 @@ void ParseCommandLine(int argc, char *argv[]) char* game_file_arg = nullptr; #if defined(GCC_UNIX) && defined(DO_COLOR) - int ch; + int ch; /* Parse comand line options (colour switches) */ while ((ch = getopt(argc, argv, "f:b:F:B:?h")) != -1) { switch (ch) { diff --git a/engines/glk/hugo/heobject.cpp b/engines/glk/hugo/heobject.cpp index 2de4bbb459c..72a9e76d6bf 100644 --- a/engines/glk/hugo/heobject.cpp +++ b/engines/glk/hugo/heobject.cpp @@ -75,7 +75,7 @@ int Hugo::Elder(int obj) { p = Parent(obj); cp = Child(p); - if (p==0 || cp==obj) + if (p==0 || cp==obj) return 0; lastobj = cp; @@ -204,7 +204,7 @@ int Hugo::GetProp(int obj, int p, int n, char s) { if (getaddress && MEM(codeptr)!=DECIMAL_T) getpropaddress = true; - tempself = var[self]; + tempself = var[self]; if (!s) var[self] = obj; temp_stack_depth = stack_depth;