[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.11,1.12 map.h,1.19,1.20 rect.h,1.14,1.15 savefile.cpp,1.4,1.5 scaler.cpp,1.52,1.53 scaler.h,1.20,1.21 scummsys.h,1.39,1.40 str.cpp,1.26,1.27 str.h,1.17,1.18 system.h,1.47,1.48 timer.cpp,1.23,1.24 timer.h,1.14,1.15 util.cpp,1.24,1.25 util.h,1.30,1.31

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Nov 8 14:44:18 CET 2003 

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv30131

Modified Files:
	config-manager.cpp map.h rect.h savefile.cpp scaler.cpp 
	scaler.h scummsys.h str.cpp str.h system.h timer.cpp timer.h 
	util.cpp util.h 
Log Message:
cleanup whitespaces

Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- config-manager.cpp	7 Nov 2003 16:54:58 -0000	1.11
+++ config-manager.cpp	8 Nov 2003 22:43:45 -0000	1.12
@@ -261,7 +261,7 @@
 
 //	if (_transientDomain.contain(key))
 //		return true;
-	
+
 	if (!dom.isEmpty()) {
 		if (_gameDomains.contains(dom) && _gameDomains[dom].contains(key))
 			return _gameDomains[dom][key];
@@ -273,7 +273,7 @@
 		if (iter->_value.contains(key))
 			return iter->_value[key];
 	}
-	
+
 	return _defaultsDomain.get(key);
 }
 

Index: map.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/map.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- map.h	7 Nov 2003 00:45:54 -0000	1.19
+++ map.h	8 Nov 2003 22:43:45 -0000	1.20
@@ -79,8 +79,8 @@
 
 		Node &operator *() { assert(_node != 0); return *_node; }
 		const Node &operator *() const { assert(_node != 0); return *_node; }
-        const Node *operator->() const { assert(_node != 0); return _node; }
-        bool operator !=(const ConstIterator &iter) const { return _node != iter._node; }
+		const Node *operator->() const { assert(_node != 0); return _node; }
+		bool operator !=(const ConstIterator &iter) const { return _node != iter._node; }
 		void operator ++() {
 			if (!_node)
 				return;

Index: rect.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/rect.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rect.h	2 Oct 2003 17:43:01 -0000	1.14
+++ rect.h	8 Nov 2003 22:43:45 -0000	1.15
@@ -59,7 +59,7 @@
 	int16 height() const { return bottom - top; }
 
 	/*!	@brief check if given position is inside this rectangle
-		
+
 		@param x the horizontal position to check
 		@param y the vertical position to check	
 		

Index: savefile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/savefile.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- savefile.cpp	3 Nov 2003 22:28:37 -0000	1.4
+++ savefile.cpp	8 Nov 2003 22:43:45 -0000	1.5
@@ -23,13 +23,11 @@
 #include "common/util.h"
 #include "common/savefile.h"
 
-uint32 SaveFile::read(void *ptr, uint32 size)
-{
+uint32 SaveFile::read(void *ptr, uint32 size) {
 	return fread(ptr, 1, size);
 }
 
-byte SaveFile::readByte()
-{
+byte SaveFile::readByte() {
 	byte b;
 	if (fread(&b, 1, 1) != 1)
 		return 0;
@@ -60,13 +58,11 @@
 	return (b << 16) | a;
 }
 
-uint32 SaveFile::write(const void *ptr, uint32 size)
-{
+uint32 SaveFile::write(const void *ptr, uint32 size) {
 	return fwrite(ptr, 1, size);
 }
 
-void SaveFile::writeByte(byte value)
-{
+void SaveFile::writeByte(byte value) {
 	fwrite(&value, 1, 1);
 }
 
@@ -90,12 +86,11 @@
 	writeUint16BE((uint16)(value & 0xffff));
 }
 
-SaveFile *SaveFileManager::open_savefile(const char *filename, const char *directory, bool saveOrLoad)
-{
+SaveFile *SaveFileManager::open_savefile(const char *filename, const char *directory, bool saveOrLoad) {
 	char buf[256];
 	join_paths(filename, directory, buf, sizeof(buf));
 	StdioSaveFile *sf = new StdioSaveFile(buf,
-					      (saveOrLoad? "wb":"rb"));
+							(saveOrLoad? "wb":"rb"));
 	if (!sf->is_open()) {
 		delete sf;
 		sf = NULL;
@@ -104,8 +99,7 @@
 }
 
 void SaveFileManager::join_paths(const char *filename, const char *directory,
-				 char *buf, int bufsize)
-{
+								 char *buf, int bufsize) {
 	buf[bufsize-1] = '\0';
 	strncpy(buf, directory, bufsize-1);
 

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- scaler.cpp	6 Nov 2003 23:54:12 -0000	1.52
+++ scaler.cpp	8 Nov 2003 22:43:45 -0000	1.53
@@ -27,7 +27,7 @@
 int gBitFormat = 565;
 
 // RGB-to-YUV lookup table
-int   RGBtoYUV[65536];
+int RGBtoYUV[65536];
 
 static const uint16 dotmatrix_565[16] = {
 	0x01E0, 0x0007, 0x3800, 0x0000,
@@ -262,7 +262,7 @@
 MAKE_WRAPPER(TV2x)
 
 static inline uint16 DOT_16(uint16 c, int j, int i) {
-  return c - ((c >> 2) & *(dotmatrix + ((j & 3) << 2) + (i & 3)));
+	return c - ((c >> 2) & *(dotmatrix + ((j & 3) << 2) + (i & 3)));
 }
 
 // FIXME: This scaler doesn't quite work. Either it needs to know where on the
@@ -272,8 +272,7 @@
 // exercise for the reader.)
 
 void DotMatrix(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
-					int width, int height)
-{
+					int width, int height) {
 	const uint32 nextlineSrc = srcPitch / sizeof(uint16);
 	const uint16 *p = (const uint16 *)srcPtr;
 

Index: scaler.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- scaler.h	4 Nov 2003 21:17:17 -0000	1.20
+++ scaler.h	8 Nov 2003 22:43:45 -0000	1.21
@@ -70,11 +70,10 @@
 	GFX_DOTMATRIX = 11,
 
 	GFX_BILINEAR = 12,    // OpenGL backend
-	
+
 	GFX_FLIPPING = 100,	// Palmos
 	GFX_DOUBLEBUFFER = 101,	// Palmos
 	GFX_WIDE = 102 // palmos
-	
 };
 
 

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- scummsys.h	3 Nov 2003 16:25:06 -0000	1.39
+++ scummsys.h	8 Nov 2003 22:43:45 -0000	1.40
@@ -167,10 +167,10 @@
 	#define SCUMM_BIG_ENDIAN
 	#define SCUMM_NEED_ALIGNMENT
 	#define NONSTANDARD_SAVE
-	
+
 	#define FORCEINLINE inline
 	#define CDECL 
-	
+
 	typedef unsigned char byte;
 	typedef unsigned char uint8;
 	typedef unsigned short uint16;

Index: str.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- str.cpp	7 Nov 2003 00:02:03 -0000	1.26
+++ str.cpp	8 Nov 2003 22:43:45 -0000	1.27
@@ -203,8 +203,8 @@
 	if (new_len <= _capacity && *_refCount == 1)
 		return;
 
-	int		newCapacity = (new_len <= _capacity) ? _capacity : new_len + 32;
-	char	*newStr = (char *)calloc(1, newCapacity+1);
+	int newCapacity = (new_len <= _capacity) ? _capacity : new_len + 32;
+	char *newStr = (char *)calloc(1, newCapacity+1);
 
 	if (keep_old && _str)
 		memcpy(newStr, _str, _len + 1);

Index: str.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- str.h	7 Nov 2003 00:02:02 -0000	1.17
+++ str.h	8 Nov 2003 22:43:46 -0000	1.18
@@ -74,8 +74,8 @@
 
 class String : public ConstString {
 protected:
-	int		*_refCount;
-	int		_capacity;
+	int *_refCount;
+	int _capacity;
 
 public:
 	static const String emptyString;

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- system.h	4 Nov 2003 20:46:20 -0000	1.47
+++ system.h	8 Nov 2003 22:43:46 -0000	1.48
@@ -202,31 +202,29 @@
 
 	/** Show or hide the mouse cursor. */
 	virtual bool show_mouse(bool visible) = 0;
-	
+
 	/** 
 	 * Move ("warp) the mouse cursor to the specified position.
 	 */
 	virtual void warp_mouse(int x, int y) = 0;
-	
+
 	/** Set the bitmap used for drawing the cursor. */
 	virtual void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) = 0;
 
 	//@}
-	
-	
 
 	/** @name Events and Time */
 	//@{
 
 	/** Get the number of milliseconds since the program was started. */
 	virtual uint32 get_msecs() = 0;
-	
+
 	/** Delay/sleep for the specified amount of milliseconds. */
 	virtual void delay_msecs(uint msecs) = 0;
-	
+
 	/** Set the timer callback. */
 	virtual void set_timer(TimerProc callback, int interval) = 0;
-	
+
 	/**
 	 * Get the next event in the event queue.
 	 * @param event	point to an Event struct, which will be filled with the event data.
@@ -248,7 +246,7 @@
 	 * @param format	the sample type format.
 	 */
 	virtual bool set_sound_proc(SoundProc proc, void *param, SoundFormat format) = 0;
-	
+
 	/**
 	 * Remove any audio callback previously set via set_sound_proc, thus effectively
 	 * stopping all audio output immediately.

Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- timer.cpp	17 Oct 2003 16:39:31 -0000	1.23
+++ timer.cpp	8 Nov 2003 22:43:46 -0000	1.24
@@ -36,7 +36,7 @@
 	_mutex = _system->create_mutex();
 
 	g_timer = this;
-	
+
 	for (int i = 0; i < MAX_TIMERS; i++) {
 		_timerSlots[i].procedure = NULL;
 		_timerSlots[i].interval = 0;

Index: timer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- timer.h	7 Nov 2003 02:43:47 -0000	1.14
+++ timer.h	8 Nov 2003 22:43:46 -0000	1.15
@@ -65,7 +65,7 @@
 	 * @return	true if the timer was installed successfully, false otherwise
 	 */
 	bool installTimerProc(TimerProc proc, int32 interval, void *refCon);
-	
+
 	/**
 	 * Remove the given timer callback. It will not be invoked anymore.
 	 */

Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- util.cpp	5 Nov 2003 00:58:02 -0000	1.24
+++ util.cpp	8 Nov 2003 22:43:46 -0000	1.25
@@ -140,7 +140,7 @@
 	{"gb", "English (GB)", EN_GRB},
 	{"se", "Swedish", SE_SWE},
 	{"hb", "Hebrew", HB_HEB},
- 	{"ru", "Russian", RU_RUS},
+	{"ru", "Russian", RU_RUS},
 	{0, 0, UNK_LANG}
 };
 

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- util.h	5 Nov 2003 00:58:02 -0000	1.30
+++ util.h	8 Nov 2003 22:43:46 -0000	1.31
@@ -59,7 +59,7 @@
 public:
 	RandomSource();
 	void setSeed(uint32 seed);
-	
+
 	/**
 	 * Generates a random unsigned integer in the interval [0, max].
 	 * @param max	the upper bound

More information about the Scummvm-git-logs mailing list