Sat Jul 30 14:15:11 CEST 2005

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/common

Modified Files:
	array.h config-file.cpp config-file.h config-manager.cpp 
	config-manager.h debugger.h endian.h file.h list.h map.h 
	md5.cpp mutex.cpp rect.h savefile.cpp savefile.h scaler.cpp 
	scummsys.h singleton.h stack.h str.cpp str.h stream.cpp 
	stream.h system.h timer.cpp util.cpp util.h 
Log Message:
Remove trailing whitespaces.


Index: array.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/array.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6

--- array.h	21 Jun 2005 22:08:14 -0000	1.5
+++ array.h	30 Jul 2005 21:10:57 -0000	1.6
@@ -128,8 +128,8 @@
 		_size = 0;
 		_capacity = 0;
 	}
-	
-	bool isEmpty() const { 
+
+	bool isEmpty() const {
 		return (_size == 0);
 	}
 

Index: config-file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- config-file.cpp	24 Jun 2005 15:22:37 -0000	1.26
+++ config-file.cpp	30 Jul 2005 21:10:57 -0000	1.27
@@ -79,7 +79,7 @@
 	KeyValue kv;
 	String comment;
 	int lineno = 0;
-	
+
 	// TODO: Detect if a section occurs multiple times (or likewise, if
 	// a key occurs multiple times inside one section).
 
@@ -114,7 +114,7 @@
 				error("Config file buggy: Invalid character '%c' occured in section name in line %d", *p, lineno);
 
 			*p = 0;
-			
+
 			// Previous section is finished now, store it.
 			if (!section.name.isEmpty())
 				_sections.push_back(section);
@@ -123,7 +123,7 @@
 			section.keys.clear();
 			section.comment = comment;
 			comment.clear();
-			
+
 			assert(isValidName(section.name));
 		} else {
 			// Skip leading & trailing whitespaces
@@ -150,11 +150,11 @@
 			comment.clear();
 
 			assert(isValidName(kv.key));
-			
+
 			section.keys.push_back(kv);
 		}
 	}
-	
+
 	// Save last section
 	if (!section.name.isEmpty())
 		_sections.push_back(section);
@@ -220,7 +220,7 @@
 void ConfigFile::renameSection(const String &oldName, const String &newName) {
 	assert(isValidName(oldName));
 	assert(isValidName(newName));
-	
+
 	//Section *os = getSection(oldName);
 	Section *ns = getSection(newName);
 	if (ns) {
@@ -237,7 +237,7 @@
 bool ConfigFile::hasKey(const String &key, const String &section) const {
 	assert(isValidName(key));
 	assert(isValidName(section));
-	
+
 	const Section *s = getSection(section);
 	if (!s)
 		return false;

Index: config-file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- config-file.h	23 Apr 2005 22:28:37 -0000	1.13
+++ config-file.h	30 Jul 2005 21:10:57 -0000	1.14
@@ -79,9 +79,9 @@
 public:
 	ConfigFile();
 	~ConfigFile();
-	
+
 	// TODO: Maybe add a copy constructor etc.?
-	
+
 	/**
 	 * Check whether the given string is a valid section or key name.
 	 * For that, it must only consist of letters, numbers, dashes and
@@ -97,7 +97,7 @@
 	bool	loadFromStream(SeekableReadStream &stream);
 	bool	saveToFile(const String &filename);
 	bool	saveToStream(WriteStream &stream);
-	
+
 	bool	hasSection(const String &section) const;
 	void	removeSection(const String &section);
 	void	renameSection(const String &oldName, const String &newName);
@@ -113,7 +113,7 @@
 
 private:
 	List<Section>	_sections;
-	
+
 	Section *getSection(const String &section);
 	const Section *getSection(const String &section) const;
 };

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- config-manager.cpp	24 Jun 2005 15:22:37 -0000	1.37
+++ config-manager.cpp	30 Jul 2005 21:10:57 -0000	1.38
@@ -127,7 +127,7 @@
 		String domain;
 		String comment;
 		int lineno = 0;
-		
+
 		// TODO: Detect if a domain occurs multiple times (or likewise, if
 		// a key occurs multiple times inside one domain).
 
@@ -162,7 +162,7 @@
 				default:
 					error("Config file buggy: Invalid character '%c' occured in domain name in line %d", *p, lineno);
 				}
-				
+
 				// Store domain comment
 				if (_globalDomains.contains(domain)) {
 					_globalDomains[domain].setDomainComment(comment);
@@ -170,7 +170,7 @@
 					_gameDomains[domain].setDomainComment(comment);
 				}
 				comment.clear();
-				
+
 				_domainSaveOrder.push_back(domain);
 			} else {
 				// Skip leading & trailing whitespaces
@@ -216,7 +216,7 @@
 	if (!(cfg_file = fopen(_filename.c_str(), "w"))) {
 		warning("Unable to write configuration file: %s", _filename.c_str());
 	} else {
-		
+
 		// First write the domains in _domainSaveOrder, in that order.
 		// Note: It's possible for _domainSaveOrder to list domains which
 		// are not present anymore.
@@ -236,7 +236,7 @@
 			if (!_domainSaveOrder.contains(d->_key))
 				writeDomain(cfg_file, d->_key, d->_value);
 		}
-		
+
 		// Finally write the remaining game domains
 		for (d = _gameDomains.begin(); d != _gameDomains.end(); ++d) {
 			if (!_domainSaveOrder.contains(d->_key))
@@ -250,14 +250,14 @@
 void ConfigManager::writeDomain(FILE *file, const String &name, const Domain &domain) {
 	if (domain.isEmpty())
 		return;		// Don't bother writing empty domains.
-	
+
 	String comment;
-	
+
 	// Write domain comment (if any)
 	comment = domain.getDomainComment();
 	if (!comment.isEmpty())
 		fprintf(file, "%s", comment.c_str());
-	
+
 	// Write domain start
 	fprintf(file, "[%s]\n", name.c_str());
 
@@ -287,13 +287,13 @@
 	// 2) Active game domain (if any)
 	// 3) All global domains
 	// The defaults domain is explicitly *not* checked.
-	
+
 	if (_transientDomain.contains(key))
 		return true;
 
 	if (!_activeDomain.isEmpty() && _gameDomains[_activeDomain].contains(key))
 		return true;
-	
+
 	DomainMap::const_iterator iter;
 	for (iter = _globalDomains.begin(); iter != _globalDomains.end(); ++iter) {
 		if (iter->_value.contains(key))
@@ -313,7 +313,7 @@
 		return _gameDomains[dom].contains(key);
 	if (_globalDomains.contains(dom))
 		return _globalDomains[dom].contains(key);
-	
+
 	return false;
 }
 
@@ -342,7 +342,7 @@
 	// 1) Transient domain
 	// 2) Active game domain (if any)
 	// 3) All global domains
-	// 4) The defaults 
+	// 4) The defaults
 
 
 	if ((domain.isEmpty() || domain == kTransientDomain) && _transientDomain.contains(key))
@@ -365,7 +365,7 @@
 int ConfigManager::getInt(const String &key, const String &dom) const {
 	String value(get(key, dom));
 	char *errpos;
-	
+
 	// For now, be tolerant against missing config keys. Strictly spoken, it is
 	// a bug in the calling code to retrieve an int for a key which isn't even
 	// present... and a default value of 0 seems rather arbitrary.
@@ -399,7 +399,7 @@
 	if (dom.isEmpty()) {
 		// Remove the transient domain value
 		_transientDomain.remove(key);
-	
+
 		if (_activeDomain.isEmpty())
 			_globalDomains[kApplicationDomain][key] = value;
 		else
@@ -486,7 +486,7 @@
 	assert(isValidDomainName(newName));
 
 	_gameDomains[newName].merge(_gameDomains[oldName]);
-	
+
 	_gameDomains.remove(oldName);
 }
 

Index: config-manager.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- config-manager.h	23 Apr 2005 17:33:28 -0000	1.24
+++ config-manager.h	30 Jul 2005 21:10:57 -0000	1.25
@@ -46,9 +46,9 @@
  *       of some specific (or any) configuration key changes.
  */
 class ConfigManager : public Singleton<ConfigManager> {
-	
+
 public:
-	
+
 	class Domain : public StringMap {
 	private:
 		StringMap _keyValueComments;
@@ -121,12 +121,12 @@
 
 	void			loadFile(const String &filename);
 	void			writeDomain(FILE *file, const String &name, const Domain &domain);
-	
+
 	Domain			_transientDomain;
 	DomainMap		_gameDomains;
 	DomainMap		_globalDomains;
 	Domain			_defaultsDomain;
-	
+
 	StringList		_domainSaveOrder;
 
 	String			_activeDomain;

Index: debugger.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/debugger.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- debugger.h	21 Jun 2005 22:08:14 -0000	1.8
+++ debugger.h	30 Jul 2005 21:10:57 -0000	1.9
@@ -35,7 +35,7 @@
 public:
 	Debugger();
 	virtual ~Debugger();
-	
+
 	int DebugPrintf(const char *format, ...);
 
 #ifndef __SYMBIAN32__ // gcc/UIQ doesn't like the debugger code for some reason? Actually get a cc1plus core dump here :)
@@ -50,7 +50,7 @@
 
 protected:
 	typedef bool (T::*DebugProc)(int argc, const char **argv);
-	
+
 	enum {
 		DVAR_BYTE,
 		DVAR_INT,
@@ -58,18 +58,18 @@
 		DVAR_INTARRAY,
 		DVAR_STRING
 	};
-	
+
 	struct DVar {
 		char name[30];
 		void *variable;
 		int type, optional;
 	};
-	
+
 	struct DCmd {
 		char name[30];
 		DebugProc function;
 	};
-	
+
 	int _frame_countdown, _dvar_count, _dcmd_count;
 	DVar _dvars[256];
 	DCmd _dcmds[256];

Index: endian.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/endian.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- endian.h	23 Jun 2005 14:15:48 -0000	1.1
+++ endian.h	30 Jul 2005 21:10:57 -0000	1.2
@@ -174,6 +174,6 @@
 	const byte *b = (const byte*)ptr;
 	return (b[0] << 16) + (b[1] << 8) + (b[2]);
 }
-	
+
 
 #endif

Index: file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- file.h	24 Jun 2005 15:22:37 -0000	1.37
+++ file.h	30 Jul 2005 21:10:57 -0000	1.38
@@ -33,10 +33,10 @@
 protected:
 	/** POSIX file handle to the actual file; 0 if no file is open. */
 	FILE *_handle;
-	
+
 	/** Status flag which tells about recent I/O failures. */
 	bool _ioFailed;
-	
+
 	/** Simple ref-counter for File objects. */
 	int32 _refcount;
 
@@ -51,10 +51,10 @@
 		kFileReadMode = 1,
 		kFileWriteMode = 2
 	};
-	
+
 	static void addDefaultDirectory(const String &directory);
 	static void resetDefaultDirectories();
-	
+
 	File();
 	virtual ~File();
 

Index: list.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/list.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- list.h	25 Jun 2005 19:43:59 -0000	1.27
+++ list.h	30 Jul 2005 21:10:57 -0000	1.28
@@ -28,7 +28,7 @@
 
 /**
  * Simple double linked list, modelled after the list template of the standard
- * C++ library. 
+ * C++ library.
  */
 template <class T>
 class List {
@@ -41,11 +41,11 @@
 		NodeBase *_prev;
 		NodeBase *_next;
 	};
-	
+
 	template <class T2>
 	struct Node : public NodeBase {
 		T2 _data;
-		
+
 		Node<T2>(const T2 &x) : _data(x) {}
 	};
 
@@ -53,7 +53,7 @@
 	class Iterator {
 		friend class List<T>;
 		NodeBase *_node;
-		
+
 		explicit Iterator<T2>(NodeBase *node) : _node(node) {}
 	public:
 		Iterator<T2>() : _node(0) {}
@@ -91,11 +91,11 @@
 		T2* operator->() const {
 			return &(operator*());
 		}
-		
+
 		bool operator==(const Iterator<T2>& x) const {
 			return _node == x._node;
 		}
-		
+
 		bool operator!=(const Iterator<T2>& x) const {
 			return _node != x._node;
 		}
@@ -141,7 +141,7 @@
 
 	void insert(iterator pos, const T& element) {
 		NodeBase *newNode = new Node<T>(element);
-		
+
 		newNode->_next = pos._node;
 		newNode->_prev = pos._node->_prev;
 		newNode->_prev->_next = newNode;
@@ -196,7 +196,7 @@
 			else
 				erase(i, end());
 		}
-		
+
 		return *this;
 	}
 
@@ -210,8 +210,8 @@
 	void clear() {
 		erase(begin(), end());
 	}
-	
-	bool isEmpty() const { 
+
+	bool isEmpty() const {
 		return (_anchor == _anchor->_next);
 	}
 

Index: map.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/map.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- map.h	21 Jun 2005 22:08:14 -0000	1.25
+++ map.h	30 Jul 2005 21:10:57 -0000	1.26
@@ -45,7 +45,7 @@
  *       balanced. Ultimately this template should be reimplemented, e.g. using
  *       a red-black tree. Or if one day using Std C++ lib becomes acceptable,
  *       we can use that.
- * @todo Having unit tests for this class would be very desirable. There are a 
+ * @todo Having unit tests for this class would be very desirable. There are a
  *       big number of things which can go wrong in this code.
  */
 template <class Key, class Value, class Comparator = DefaultComparator<Key> >
@@ -59,7 +59,7 @@
 		Node() : _parent(0), _left(0), _right(0) {}
 		Node(const Key &key, Node *parent) : _parent(parent), _left(0), _right(0), _key(key) {}
 	};
-	
+
 	Node *_root;
 	Node *_header;
 
@@ -73,7 +73,7 @@
 	protected:
 		Node *_node;
 		const_iterator(Node *node) : _node(node) {}
-		
+
 	public:
 		const_iterator() : _node(0) {}
 
@@ -109,7 +109,7 @@
 		_header = new Node();
 		_header->_right = _header->_left = _header;
 	}
-	
+
 #ifndef __SYMBIAN32__
 	virtual ~Map<Key, Value, Comparator>()
 #else
@@ -199,7 +199,7 @@
 			parent->_left = rep;
 		else
 			parent->_right = rep;
-		
+
 		// Finally free the allocated memory
 		delete node;
 	}

Index: md5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/md5.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- md5.cpp	15 May 2005 13:57:58 -0000	1.9
+++ md5.cpp	30 Jul 2005 21:10:57 -0000	1.10
@@ -118,7 +118,7 @@
 	P(B, C, D, A, 12, 20, 0x8D2A4C8A);
 
 #undef F
-	
+
 #define F(x, y, z) (x ^ y ^ z)
 
 	P(A, B, C, D,  5,  4, 0xFFFA3942);
@@ -245,9 +245,9 @@
 		return false;
 	}
 
-	if (!restricted || sizeof(buf) <= length) 
+	if (!restricted || sizeof(buf) <= length)
 		readlen = sizeof(buf);
-	else 
+	else
 		readlen = length;
 
 	md5_starts(&ctx);
@@ -334,7 +334,7 @@
 			for (j = 0; j < 16; j++) {
 				printf("%02x", md5sum[j]);
 			}
-	
+
 			printf("  %s\n", argv[i]);
 		}
 	}

Index: mutex.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/mutex.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mutex.cpp	24 Jun 2005 15:22:37 -0000	1.3
+++ mutex.cpp	30 Jul 2005 21:10:57 -0000	1.4
@@ -62,7 +62,7 @@
 void StackLock::lock() {
 	if (_mutexName != NULL)
 		debug(6, "Locking mutex %s", _mutexName);
-	
+
 	g_system->lockMutex(_mutex);
 }
 

Index: rect.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/rect.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- rect.h	28 May 2005 12:53:11 -0000	1.26
+++ rect.h	30 Jul 2005 21:10:57 -0000	1.27
@@ -47,18 +47,18 @@
 
 	This small class is an helper for rectangles.
 	Note: This implementation is built around the assumption that (top,left) is
-	part of the rectangle, but (bottom,right) is not! This is reflected in 
+	part of the rectangle, but (bottom,right) is not! This is reflected in
 	various methods, including contains(), intersects() and others.
-	
+
 	Another very wide spread approach to rectangle classes treats (bottom,right)
 	also as a part of the rectangle.
-	
+
 	Coneptually, both are sound, but the approach we use saves many intermediate
 	computations (like computing the height in our case is done by doing this:
 	  height = bottom - top;
 	while in the alternate system, it would be
 	  height = bottom - top + 1;
-	
+
 	When writing code using our Rect class, always keep this principle in mind!
 */
 struct Rect {
@@ -72,7 +72,7 @@
 	}
 	int16 width() const { return right - left; }
 	int16 height() const { return bottom - top; }
-	
+
 	void setWidth(int16 aWidth) {
 		right = left + aWidth;
 	}
@@ -84,8 +84,8 @@
 	/*!	@brief check if given position is inside this rectangle
 
 		@param x the horizontal position to check
-		@param y the vertical position to check	
-		
+		@param y the vertical position to check
+
 		@return true if the given position is inside this rectangle, false otherwise
 	*/
 	bool contains(int16 x, int16 y) const {
@@ -93,9 +93,9 @@
 	}
 
 	/*!	@brief check if given point is inside this rectangle
-		
+
 		@param p the point to check
-		
+
 		@return true if the given point is inside this rectangle, false otherwise
 	*/
 	bool contains(const Point & p) const {
@@ -103,9 +103,9 @@
 	}
 
 	/*!	@brief check if given rectangle intersects with this rectangle
-		
+
 		@param r the rectangle to check
-		
+
 		@return true if the given rectangle is inside the rectangle, false otherwise
 	*/
 	bool intersects(const Rect & r) const {
@@ -113,7 +113,7 @@
 	}
 
 	/*!	@brief extend this rectangle so that it contains r
-		
+
 		@param r the rectangle to extend by
 	*/
 	void extend(const Rect & r) {
@@ -122,9 +122,9 @@
 		top = MIN(top, r.top);
 		bottom = MAX(bottom, r.bottom);
 	}
-	
+
 	/*!	@brief extend this rectangle in all four directions by the given number of pixels
-		
+
 		@param offset the size to grow by
 	*/
 	void grow(int16 offset) {
@@ -133,7 +133,7 @@
 		bottom += offset;
 		right += offset;
 	}
-	
+
 	void clip(const Rect & r) {
 		assert(isValidRect());
 		assert(r.isValidRect());
@@ -150,22 +150,22 @@
 		if (right > r.right) right = r.right;
 		else if (right < r.left) right = r.left;
 	}
-	
+
 	void clip(int maxw, int maxh) {
 		clip(Rect(0, 0, maxw, maxh));
 	}
-	
+
 	bool isValidRect() const {
 		return (left <= right && top <= bottom);
 	}
-	
+
 	void moveTo(int16 x, int16 y) {
 		bottom += y - top;
 		right += x - left;
 		top = y;
 		left = x;
 	}
-	
+
 	void moveTo(const Point & p) {
 		moveTo(p.x, p.y);
 	}

Index: savefile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/savefile.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- savefile.cpp	24 Jun 2005 16:07:29 -0000	1.27
+++ savefile.cpp	30 Jul 2005 21:10:57 -0000	1.28
@@ -43,7 +43,7 @@
 
 	// Try to use game specific savepath from config
 	dir = ConfMan.get("savepath").c_str();
-	
+
 	// Work around a bug (#999122) in the original 0.6.1 release of
 	// ScummVM, which would insert a bad savepath value into config files.
 	if (0 == strcmp(dir, "None")) {
@@ -127,7 +127,7 @@
 		// hackish here and remove the const qualifier.
 		// Note that gzwrite's buf param is declared as "const voidp"
 		// which you might think is the same as "const void *" but it
-		// is not - rather it is equal to "void const *" which is the 
+		// is not - rather it is equal to "void const *" which is the
 		// same as "void *". Hrmpf
 		int ret = ::gzwrite(fh, const_cast<void *>(dataPtr), dataSize);
 		if (ret <= 0)

Index: savefile.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/savefile.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- savefile.h	24 Jun 2005 16:07:29 -0000	1.21
+++ savefile.h	30 Jul 2005 21:10:57 -0000	1.22
@@ -36,7 +36,7 @@
 class InSaveFile : public Common::ReadStream {
 public:
 	virtual ~InSaveFile() {}
-	
+
 	/**
 	 * Skip over the specified (positive) amount of bytes in the input stream.
 	 */

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- scaler.cpp	23 Jun 2005 14:18:25 -0000	1.70
+++ scaler.cpp	30 Jul 2005 21:10:57 -0000	1.71
@@ -44,10 +44,10 @@
 
 // FIXME/TODO: The following two tables suck up 512 KB.
 // They should at least be allocated on the heap, to reduce the size of the
-// binary. 
+// binary.
 //
 // Note: a memory lookup table is *not* necessarily faster than computing
-// these things on the fly, because of its size. Both tables together, plus 
+// these things on the fly, because of its size. Both tables together, plus
 // the code, plus the input/output GFX data, won't fit in the cache on many
 // systems, so main memory has to be accessed, which is about the worst thing
 // that can happen to code which tries to be fast...
@@ -64,7 +64,7 @@
 // size of the lookup tables at the cost of some additional computations? That
 // might actually result in a speedup, too, if done right (and the code code
 // might actually be suitable for AltiVec/MMX/SSE speedup).
-// 
+//
 // Of course, the above is largely a conjecture, and the actual speed
 // differences are likely to vary a lot between different architectures and
 // CPUs.
@@ -108,7 +108,7 @@
 	int r, g, b;
 	int Y, u, v;
 	int gInc, gShift;
-	
+
 	for (int i = 0; i < 65536; i++) {
 		LUT16to32[i] = ((i & 0xF800) << 8) + ((i & 0x07E0) << 5) + ((i & 0x001F) << 3);
 	}
@@ -159,7 +159,7 @@
 		r = dstPtr;
 		for (int i = 0; i < width; ++i, r += 4) {
 			uint32 color = *(((const uint16 *)srcPtr) + i);
-			
+
 			color |= color << 16;
 
 			*(uint32 *)(r) = color;
@@ -259,7 +259,7 @@
 }
 
 template<int bitFormat>
-void TV2xTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, 
+void TV2xTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
 					int width, int height) {
 	const uint32 nextlineSrc = srcPitch / sizeof(uint16);
 	const uint16 *p = (const uint16 *)srcPtr;

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- scummsys.h	5 Jul 2005 20:22:37 -0000	1.64
+++ scummsys.h	30 Jul 2005 21:10:58 -0000	1.65
@@ -68,7 +68,7 @@
 	typedef signed char int8;
 	typedef signed short int16;
 	typedef signed long int32;
-	
+
 	#define START_PACK_STRUCTS pack(push, 1)
 	#define END_PACK_STRUCTS	 pack(pop)
 
@@ -108,14 +108,14 @@
 
 	#ifndef CONFIG_H
 		#ifdef X11_BACKEND
-	
+
 		// You need to set this manually if necessary
 	//	#define SCUMM_LITTLE_ENDIAN
-		
+
 		#else
 		/* need this for the SDL_BYTEORDER define */
 		#include <SDL_byteorder.h>
-	
+
 		#if SDL_BYTEORDER == SDL_LIL_ENDIAN
 		#define SCUMM_LITTLE_ENDIAN
 		#elif SDL_BYTEORDER == SDL_BIG_ENDIAN
@@ -155,12 +155,12 @@
 	#include <PalmOS.h>
 	#include "globals.h"
 	#include "extend.h"
-	
+
 	#define STRINGBUFLEN 256
 
 	#define scumm_stricmp stricmp
 	#define scumm_strnicmp strnicmp
-	
+
 	#define SCUMM_BIG_ENDIAN
 	#define SCUMM_NEED_ALIGNMENT
 
@@ -172,7 +172,7 @@
 	typedef signed char int8;
 	typedef signed short int16;
 	typedef signed long int32;
-	
+
 	#define START_PACK_STRUCTS pack (1)
 	#define END_PACK_STRUCTS   pack ()
 
@@ -222,7 +222,7 @@
 
 #elif defined __GP32__ //ph0x
 	#define SCUMM_NEED_ALIGNMENT
-	#define SCUMM_LITTLE_ENDIAN 
+	#define SCUMM_LITTLE_ENDIAN
 
 	#define scumm_stricmp stricmp
 	#define scumm_strnicmp strnicmp
@@ -242,7 +242,7 @@
 	#define END_PACK_STRUCTS	 pack(pop)
 #elif defined __PLAYSTATION2__
 	#define SCUMM_NEED_ALIGNMENT
-	#define SCUMM_LITTLE_ENDIAN 
+	#define SCUMM_LITTLE_ENDIAN
 
 	#define scumm_stricmp strcasecmp
 	#define scumm_strnicmp strncasecmp
@@ -300,12 +300,12 @@
 	#define scumm_stricmp strcasecmp
 	#define scumm_strnicmp strncasecmp
 
-	#define CDECL	
+	#define CDECL
 	#define SCUMM_NEED_ALIGNMENT
-	#define SCUMM_LITTLE_ENDIAN	
+	#define SCUMM_LITTLE_ENDIAN
 	#define CHECK_HEAP
 	#define SMALL_SCREEN_DEVICE
-	
+
 	#define FORCEINLINE inline
 	#define _HEAPOK 0
 	typedef unsigned char byte;
@@ -316,7 +316,7 @@
 	typedef signed char int8;
 	typedef signed short int int16;
 	typedef signed long int int32;
-	
+
 	#define START_PACK_STRUCTS pack (push,1)
 	#define END_PACK_STRUCTS   pack(pop)
 #else
@@ -329,7 +329,7 @@
 //
 #if defined(__GNUC__)
 	#define GCC_PACK __attribute__((packed))
-	#define NORETURN __attribute__((__noreturn__)) 
+	#define NORETURN __attribute__((__noreturn__))
 #else
 	#define GCC_PACK
 #endif

Index: singleton.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/singleton.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- singleton.h	21 Jun 2005 22:08:14 -0000	1.15
+++ singleton.h	30 Jul 2005 21:10:58 -0000	1.16
@@ -34,7 +34,7 @@
 private:
 	Singleton<T>(const Singleton<T>&);
 	Singleton<T>& operator= (const Singleton<T>&);
-	
+
 	static T* _singleton;
 
 	/**
@@ -52,7 +52,7 @@
 	static T* makeInstance() {
 		return new T();
 	}
-	
+
 
 public:
 	static T& instance() {
@@ -74,7 +74,7 @@
 #else
 	virtual ~Singleton<T>()	{ }
 #endif
-	
+
 	typedef T	SingletonBaseType;
 };
 

Index: stack.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stack.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- stack.h	1 Jan 2005 16:08:50 -0000	1.5
+++ stack.h	30 Jul 2005 21:10:58 -0000	1.6
@@ -37,7 +37,7 @@
 	int	_size;
 public:
 	FixedStack<T, MAX_SIZE>() : _size(0) {}
-	
+
 	bool empty() const {
 		return _size <= 0;
 	}
@@ -80,7 +80,7 @@
 	Array<T>	_stack;
 public:
 	Stack<T>() {}
-	
+
 	bool empty() const {
 		return _stack.isEmpty();
 	}

Index: str.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- str.cpp	24 Jun 2005 15:22:38 -0000	1.36
+++ str.cpp	30 Jul 2005 21:10:58 -0000	1.37
@@ -221,7 +221,7 @@
 }
 
 void String::ensureCapacity(int new_len, bool keep_old) {
-	// If there is not enough space, or if we are not the only owner 
+	// If there is not enough space, or if we are not the only owner
 	// of the current data, then we have to reallocate it.
 	if (new_len <= _capacity && *_refCount == 1)
 		return;

Index: str.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- str.h	15 May 2005 13:20:52 -0000	1.27
+++ str.h	30 Jul 2005 21:10:58 -0000	1.28
@@ -43,7 +43,7 @@
 	String(const char *str, int len = -1);
 	String(const String &str);
 	virtual ~String();
-	
+
 	String &operator  =(const char *str);
 	String &operator  =(const String &str);
 	String &operator  =(char c);
@@ -78,7 +78,7 @@
 		assert(_str && idx >= 0 && idx < _len);
 		return _str[idx];
 	}
-	
+
 	void deleteLastChar();
 	void deleteChar(int p);
 	void clear();

Index: stream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stream.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- stream.cpp	24 Jun 2005 15:22:38 -0000	1.9
+++ stream.cpp	30 Jul 2005 21:10:58 -0000	1.10
@@ -78,14 +78,14 @@
 	// Unix and OS X use LF line breaks
 	// Macintosh before OS X uses CR line breaks
 
-	
+
 	c = readByte();
 	if (eos() || ioFailed()) {
 		return 0;
 	}
 
 	while (!eos() && len + 1 < bufSize) {
-		
+
 		if (ioFailed())
 			return 0;
 
@@ -101,7 +101,7 @@
 
 		*p++ = c;
 		len++;
-		
+
 		c = readByte();
 	}
 

Index: stream.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stream.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- stream.h	24 Jun 2005 16:07:29 -0000	1.21
+++ stream.h	30 Jul 2005 21:10:58 -0000	1.22
@@ -40,12 +40,12 @@
 	 * Returns true if any I/O failure occured.
 	 * This flag is never cleared automatically. In order to clear it,
 	 * client code has to call clearIOFailed() explicitly.
-	 * 
+	 *
 	 * @todo Instead of returning a plain bool, maybe we should define
 	 *       a list of error codes which can be returned here.
 	 */
 	virtual bool ioFailed() const { return false; }
-	
+
 	/**
 	 * Reset the I/O error status.
 	 */
@@ -114,7 +114,7 @@
 	void writeSint32BE(int32 value) {
 		writeUint32BE((uint32)value);
 	}
-	
+
 	void writeString(const String &str);
 };
 
@@ -205,16 +205,16 @@
  */
 class SeekableReadStream : public ReadStream {
 public:
-	
+
 	virtual uint32 pos() const = 0;
 	virtual uint32 size() const = 0;
 
 	virtual void seek(int32 offs, int whence = SEEK_SET) = 0;
-	
+
 	/**
 	 * Read one line of text from a CR or CR/LF terminated plain text file.
-	 * This method is a rough analog of the (f)gets function. 
-	 * 
+	 * This method is a rough analog of the (f)gets function.
+	 *
 	 * @param buf	the buffer to store into
 	 * @param bufSize	the size of the buffer
 	 * @return a pointer to the read string, or NULL if an error occured

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- system.h	10 May 2005 23:48:36 -0000	1.103
+++ system.h	30 Jul 2005 21:10:58 -0000	1.104
@@ -52,16 +52,16 @@
 	friend class Common::Singleton<SingletonBaseType>;
 
 public:
-	
+
 	/**
 	 * The following method is called once, from main.cpp, after all
 	 * config data (including command line params etc.) are fully loaded.
 	 */
 	virtual void initBackend() { }
-	
+
 	/** @name Feature flags */
 	//@{
-	
+
 	/**
 	 * A feature in this context means an ability of the backend which can be
 	 * either on or off. Examples include:
@@ -102,10 +102,10 @@
 		 * This flag is a bit more obscure: it gives a hint to the backend that
 		 * the frontend code is very inefficient in doing screen updates. So
 		 * the frontend might do a lot of fullscreen blits even though only a
-		 * tiny portion of the actual screen data changed. In that case, it 
+		 * tiny portion of the actual screen data changed. In that case, it
 		 * might pay off for the backend to compute which parts actual changed,
 		 * and then only mark those as dirty.
-		 * Implementing this is purely optional, and no harm should arise 
+		 * Implementing this is purely optional, and no harm should arise
 		 * when not doing so (except for decreased speed in said frontends).
 		 */
 		kFeatureAutoComputeDirtyRects,
@@ -123,7 +123,7 @@
 		 */
 		kFeatureOverlaySupportsAlpha
 	};
-	
+
 	/**
 	 * Determine whether the backend supports the specified feature.
 	 */
@@ -134,7 +134,7 @@
 	 * enable fullscreen mode, or to deactivate aspect correction, etc.
 	 */
 	virtual void setFeatureState(Feature f, bool enable) {}
-	
+
 	/**
 	 * Query the state of the specified feature. For example, test whether
 	 * fullscreen mode is active or not.
@@ -153,19 +153,19 @@
 	 * an efficient manner. The downside of this is that it may be
 	 * rather complicated for backend authors to fully understand and
 	 * implement the semantics of the OSystem interface.
-	 * 
-	 * 
+	 *
+	 *
 	 * The graphics visible to the user in the end are actually
 	 * composed in three layers: the game graphics, the overlay
 	 * graphics, and the mouse.
-	 * 
+	 *
 	 * First, there are the game graphics. They are always 8bpp, and
 	 * the methods in this section deal with them exclusively. In
 	 * particular, the size of the game graphics is defined by a call
 	 * to initSize(), and copyRectToScreen() blits 8bpp data into the
 	 * game layer. Let W and H denote the width and height of the
 	 * game graphics.
-	 * 
+	 *
 	 * Before the user sees these graphics, they may undergo certain
 	 * transformations; for example, the may be scaled to better fit
 	 * on the visible screen; or aspect ratio correction may be
@@ -173,20 +173,20 @@
 	 * this, a pixel of the game graphics may occupy a region bigger
 	 * than a single pixel on the screen. We define p_w and p_h to be
 	 * the width resp. height of a game pixel on the screen.
-	 * 
+	 *
 	 * In addition, there is a vertical "shake offset" (as defined by
 	 * setShakePos) which is used in some games to provide a shaking
 	 * effect. Note that shaking is applied to all three layers, i.e.
 	 * also to the overlay and the mouse. We denote the shake offset
 	 * by S.
-	 * 
+	 *
 	 * Putting this together, a pixel (x,y) of the game graphics is
 	 * transformed to a rectangle of height p_h and widht p_w
 	 * appearing at position (p_w * x, p_hw * (y + S)) on the real
 	 * screen (in addition, a backend may choose to offset
 	 * everything, e.g. to center the graphics on the screen).
-	 * 
-	 * 
+	 *
+	 *
 	 * The next layer is the overlay. It is composed over the game
 	 * graphics. By default, it has exactly the same size and
 	 * resolution as the game graphics. However, client code can
@@ -196,9 +196,9 @@
 	 * graphics. For example, if the overlay scale is 2, and the game
 	 * graphics have a resolution of 320x200; then the overlay shall
 	 * have a resolution of 640x400, but it still has the same
-	 * physical size as the game graphics. 
-	 * 
-	 * 
+	 * physical size as the game graphics.
+	 *
+	 *
 	 * Finally, there is the mouse layer. This layer doesn't have to
 	 * actually exist within the backend -- it all depends on how a
 	 * backend chooses to implement mouse cursors, but in the default
@@ -247,7 +247,7 @@
 	 * @return a list of supported graphics modes
 	 */
 	virtual const GraphicsMode *getSupportedGraphicsModes() const = 0;
-	
+
 	/**
 	 * Return the ID of the 'default' graphics mode. What exactly this means
 	 * is up to the backend. This mode is set by the client code when no user
@@ -257,7 +257,7 @@
 	 * @return the ID of the 'default' graphics mode
 	 */
 	virtual int getDefaultGraphicsMode() const = 0;
-	
+
 	/**
 	 * Switch to the specified graphics mode. If switching to the new mode
 	 * failed, this method returns false.
@@ -367,7 +367,7 @@
 	 *       API are probably going to remove it.
 	 */
 	virtual void setPalette(const byte *colors, uint start, uint num) = 0;
-	
+
 	/**
 	 * Grabs a specified part of the currently active palette.
 	 * The format is the same as for setPalette.
@@ -397,7 +397,7 @@
 	 * @return true if all went well, false if an error occured
 	 */
 	virtual bool grabRawScreen(Graphics::Surface *surf) { return false; }
-	
+
 	/**
 	 * Clear the screen to black.
 	 */
@@ -408,7 +408,7 @@
 
 	/**
 	 * Set current shake position, a feature needed for some SCUMM screen effects.
-	 * The effect causes the displayed graphics to be shifted upwards by the specified 
+	 * The effect causes the displayed graphics to be shifted upwards by the specified
 	 * (always positive) offset. The area at the bottom of the screen which is moved
 	 * into view by this is filled by black. This does not cause any graphic data to
 	 * be lost - that is, to restore the original view, the game engine only has to
@@ -429,7 +429,7 @@
 	 * @name Overlay
 	 * In order to be able to display dialogs atop the game graphics, backends
 	 * must provide an overlay mode.
-	 * 
+	 *
 	 * While the game graphics are always 8 bpp, the overlay can be 8 or 16 bpp.
 	 * Depending on which it is, OverlayColor is 8 or 16 bit.
 	 *
@@ -437,13 +437,13 @@
 	 * the game graphics. On backends which support alpha blending, this is
 	 * no issue; but on other systems (in particular those which only support
 	 * 8bpp), this needs some trickery.
-	 * 
+	 *
 	 * Essentially, we fake (alpha) blending on these systems by copying the
 	 * game graphics into the overlay buffer, then manually compose whatever
 	 * graphics we want to show in the overlay.
 	 */
 	//@{
-	
+
 	/** Activate the overlay mode. */
 	virtual void showOverlay() = 0;
 
@@ -462,21 +462,21 @@
 	 * current game graphics screen into the overlay.
 	 */
 	virtual void clearOverlay() = 0;
-	
+
 	/**
 	 * Copy the content of the overlay into a buffer provided by the caller.
 	 * This is only used to implement fake alpha blending.
 	 */
 	virtual void grabOverlay(OverlayColor *buf, int pitch) = 0;
-	
+
 	/**
-	 * Blit a graphics buffer to the overlay. 
+	 * Blit a graphics buffer to the overlay.
 	 * In a sense, this is the reverse of grabOverlay.
 	 * @see copyRectToScreen
 	 * @see grabOverlay
 	 */
 	virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) = 0;
-	
+
 	/**
 	 * Return the height of the overlay.
 	 * @see getHeight
@@ -555,8 +555,8 @@
 	/** Show or hide the mouse cursor. */
 	virtual bool showMouse(bool visible) = 0;
 
-	/** 
-	 * Move ("warp") the mouse cursor to the specified position in virtual 
+	/**
+	 * Move ("warp") the mouse cursor to the specified position in virtual
 	 * screen coordinates.
 	 * @param x		the new x position of the mouse
 	 * @param y		the new x position of the mouse
@@ -693,7 +693,7 @@
 			 */
 			int keycode;
 			/**
-			 * ASCII-value of the pressed key (if any). 
+			 * ASCII-value of the pressed key (if any).
 			 * This depends on modifiers, i.e. pressing the 'A' key results in
 			 * different values here depending on the status of shift, alt and
 			 * caps lock.
@@ -701,7 +701,7 @@
 			 */
 			uint16 ascii;
 			/**
-			 * Status of the modifier keys. Bits are set in this for each 
+			 * Status of the modifier keys. Bits are set in this for each
 			 * pressed modifier
 			 * @see KBD_CTRL, KBD_ALT, KBD_SHIFT
 			 */
@@ -767,7 +767,7 @@
 	 * can use dummy implementations for these methods.
 	 */
 	//@{
-	
+
 	typedef Common::MutexRef	MutexRef;
 
 	/**
@@ -851,7 +851,7 @@
 	virtual bool pollCD() = 0;
 
 	/**
-	 * Start audio CD playback. 
+	 * Start audio CD playback.
 	 * @param track			the track to play.
 	 * @param num_loops		how often playback should be repeated (-1 = infinitely often).
 	 * @param start_frame	the frame at which playback should start (75 frames = 1 second).
@@ -909,4 +909,4 @@
 #define g_system	(&OSystem::instance())
 
 
-#endif 
+#endif

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- timer.cpp	24 Jun 2005 15:22:38 -0000	1.35
+++ timer.cpp	30 Jul 2005 21:10:58 -0000	1.36
@@ -51,7 +51,7 @@
 }
 
 Timer::~Timer() {
-	// Remove the timer callback. 
+	// Remove the timer callback.
 	// Note: backends *must* gurantee that after this method call returns,
 	// the handler is not in use anymore; else race condtions could occurs.
 	_system->setTimerCallback(0, 0);

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- util.cpp	24 Jun 2005 15:22:38 -0000	1.57
+++ util.cpp	30 Jul 2005 21:10:58 -0000	1.58
@@ -52,7 +52,7 @@
 		offset += bytesPerLine;
 	}
 
-	if (len <= 0) 
+	if (len <= 0)
 		return;
 
 	printf("%06x: ", offset);
@@ -187,7 +187,7 @@
 		return kPlatformUnknown;
 
 	const char *s = str.c_str();
-	
+
 	// Handle some special case separately, for compatibility with old config
 	// files.
 	if (!strcmp(s, "1"))

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- util.h	22 May 2005 02:07:30 -0000	1.53
+++ util.h	30 Jul 2005 21:10:58 -0000	1.54
@@ -154,7 +154,7 @@
 extern const char *getPlatformCode(Platform id);
 extern const char *getPlatformDescription(Platform id);
 
-/** 
+/**
  * List of render modes. It specifies which original graphics mode
  * to use. Some targets used postprocessing dithering routines for
  * reducing color depth of final image which let it to be rendered on



