From 438ba985a4a97a8695a6e6fdda6930694976c07b Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Thu, 21 Jul 2016 11:44:36 +0600 Subject: JANITORIAL: Remove spaces at the end of the line I knew there were some, but I wanted to fix them once, instead of doing it all the time. --- common/config-manager.cpp | 2 +- common/file.cpp | 6 +++--- common/json.cpp | 4 ++-- common/memstream.h | 4 ++-- common/str.h | 8 ++++---- common/xmlparser.cpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'common') diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 40d8aca219..fdd0c6f033 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -129,7 +129,7 @@ void ConfigManager::addDomain(const String &domainName, const ConfigManager::Dom _keymapperDomain = domain; #endif #ifdef USE_CLOUD - } else if (domainName == kCloudDomain) { + } else if (domainName == kCloudDomain) { _cloudDomain = domain; #endif } else if (domain.contains("gameid")) { diff --git a/common/file.cpp b/common/file.cpp index 5f3402e9ed..9797bcaa69 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -161,14 +161,14 @@ bool DumpFile::open(const String &filename, bool createPath) { Common::String subpath = filename; subpath.erase(i); if (subpath.empty()) continue; - AbstractFSNode *node = g_system->getFilesystemFactory()->makeFileNodePath(subpath); - if (node->exists()) continue; + AbstractFSNode *node = g_system->getFilesystemFactory()->makeFileNodePath(subpath); + if (node->exists()) continue; if (!node->create(true)) warning("DumpFile: unable to create directories from path prefix"); } } } - FSNode node(filename); + FSNode node(filename); return open(node); } diff --git a/common/json.cpp b/common/json.cpp index f95a44f8fe..d0e585ac3d 100644 --- a/common/json.cpp +++ b/common/json.cpp @@ -281,7 +281,7 @@ JSONValue *JSONValue::parse(const char **data) { return new JSONValue(str); } - // Is it a boolean? + // Is it a boolean? else if ((simplejson_wcsnlen(*data, 4) && scumm_strnicmp(*data, "true", 4) == 0) || (simplejson_wcsnlen(*data, 5) && scumm_strnicmp(*data, "false", 5) == 0)) { bool value = scumm_strnicmp(*data, "true", 4) == 0; (*data) += value ? 4 : 5; @@ -989,7 +989,7 @@ String JSONValue::stringifyImpl(size_t const indentDepth) const { case JSONType_IntegerNumber: { char str[80]; sprintf(str, "%lld", _integerValue); - ret_string = str; + ret_string = str; break; } diff --git a/common/memstream.h b/common/memstream.h index 76fa07cd24..94b8d1992d 100644 --- a/common/memstream.h +++ b/common/memstream.h @@ -230,7 +230,7 @@ private: _capacity = MAX(new_len + 32, _capacity * 2); _data = (byte *)malloc(_capacity); - if (old_data) { + if (old_data) { // Copy old data if (_readPos < _writePos) { memcpy(_data, old_data + _readPos, _writePos - _readPos); @@ -289,7 +289,7 @@ public: uint32 pos() const { return _pos - _length; } //'read' position in the stream uint32 size() const { return _size; } //that's also 'write' position in the stream, as it's append-only - byte *getData() { return _data; } + byte *getData() { return _data; } }; } // End of namespace Common diff --git a/common/str.h b/common/str.h index 1293d89508..d55ba072a9 100644 --- a/common/str.h +++ b/common/str.h @@ -236,12 +236,12 @@ public: void trim(); uint hash() const; - + /**@{ * Functions to replace some amount of chars with chars from some other string. * * @note The implementation follows that of the STL's std::string: - * http://www.cplusplus.com/reference/string/string/replace/ + * http://www.cplusplus.com/reference/string/string/replace/ * * @param pos Starting position for the replace in the original string. * @param count Number of chars to replace from the original string. @@ -250,7 +250,7 @@ public: * @param countOri Same as count * @param posDest Initial position to read str from. * @param countDest Number of chars to read from str. npos by default. - */ + */ // Replace 'count' bytes, starting from 'pos' with str. void replace(uint32 pos, uint32 count, const String &str); // The same as above, but accepts a C-like array of characters. @@ -267,7 +267,7 @@ public: // str[posDest, posDest + countDest) void replace(uint32 posOri, uint32 countOri, const char *str, uint32 posDest, uint32 countDest); - /**@}*/ + /**@}*/ /** * Print formatted data into a String object. Similar to sprintf, diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp index da4f577e3c..4470180710 100644 --- a/common/xmlparser.cpp +++ b/common/xmlparser.cpp @@ -128,7 +128,7 @@ bool XMLParser::parserError(const String &errStr) { while (currentPosition--) errorMessage += (char)_stream->readByte(); } - + errorMessage += "\n\nParser error: "; errorMessage += errStr; errorMessage += "\n\n"; -- cgit v1.2.3