[Scummvm-cvs-logs] SF.net SVN: scummvm:[51094] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Jul 21 20:17:53 CEST 2010
Revision: 51094
http://scummvm.svn.sourceforge.net/scummvm/?rev=51094&view=rev
Author: lordhoto
Date: 2010-07-21 18:17:51 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
Strip trailing whitespaces in our common code base.
Modified Paths:
--------------
scummvm/trunk/common/ptr.h
scummvm/trunk/common/singleton.h
scummvm/trunk/common/textconsole.cpp
scummvm/trunk/common/translation.cpp
scummvm/trunk/common/unarj.cpp
scummvm/trunk/common/util.cpp
scummvm/trunk/graphics/video/dxa_decoder.h
scummvm/trunk/graphics/video/flic_decoder.cpp
scummvm/trunk/graphics/video/qt_decoder.cpp
scummvm/trunk/graphics/video/video_decoder.cpp
scummvm/trunk/gui/ThemeEngine.cpp
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/widget.cpp
scummvm/trunk/gui/widget.h
scummvm/trunk/sound/audiostream.cpp
scummvm/trunk/sound/decoders/mp3.cpp
scummvm/trunk/sound/mididrv.cpp
scummvm/trunk/sound/mididrv.h
scummvm/trunk/sound/musicplugin.h
scummvm/trunk/sound/softsynth/mt32.cpp
scummvm/trunk/test/common/tokenizer.h
Modified: scummvm/trunk/common/ptr.h
===================================================================
--- scummvm/trunk/common/ptr.h 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/common/ptr.h 2010-07-21 18:17:51 UTC (rev 51094)
@@ -242,7 +242,7 @@
*/
operator bool() const { return _pointer != 0; }
- ~ScopedPtr() {
+ ~ScopedPtr() {
delete _pointer;
}
@@ -255,14 +255,14 @@
}
/**
- * Returns the plain pointer value.
+ * Returns the plain pointer value.
*
* @return the pointer the ScopedPtr manages
*/
PointerType get() const { return _pointer; }
/**
- * Returns the plain pointer value and releases ScopedPtr.
+ * Returns the plain pointer value and releases ScopedPtr.
* After release() call you need to delete object yourself
*
* @return the pointer the ScopedPtr manages
Modified: scummvm/trunk/common/singleton.h
===================================================================
--- scummvm/trunk/common/singleton.h 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/common/singleton.h 2010-07-21 18:17:51 UTC (rev 51094)
@@ -95,7 +95,7 @@
* Note that you need to use this macro from the global namespace.
*
* This is because C++ requires initial explicit specialization
- * to be placed in the same namespace as the template.
+ * to be placed in the same namespace as the template.
* It has to be put in the global namespace to assure the correct
* namespace Common is referenced.
*/
Modified: scummvm/trunk/common/textconsole.cpp
===================================================================
--- scummvm/trunk/common/textconsole.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/common/textconsole.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -162,7 +162,7 @@
#ifdef __PSP__
PspDebugTrace(false, "%s", buf_output); // write to file
#endif
-
+
// Finally exit. quit() will terminate the program if g_system is present
if (g_system)
g_system->quit();
Modified: scummvm/trunk/common/translation.cpp
===================================================================
--- scummvm/trunk/common/translation.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/common/translation.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -65,7 +65,7 @@
// http://msdn.microsoft.com/en-us/library/dd318101%28VS.85%29.aspx
// On the other hand the locale constants used, seem to exist on Windows 98 too,
// check this for that: http://msdn.microsoft.com/en-us/library/dd464799%28v=VS.85%29.aspx
- //
+ //
// I am not exactly sure what is the truth now, it might be very well that this breaks
// support for systems older than Windows 2000....
//
Modified: scummvm/trunk/common/unarj.cpp
===================================================================
--- scummvm/trunk/common/unarj.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/common/unarj.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -738,7 +738,7 @@
warning("ArjArchive::ArjArchive(): Could not find the archive file");
return;
}
-
+
int32 firstHeaderOffset = findHeader(arjFile);
if (firstHeaderOffset < 0) {
@@ -828,7 +828,7 @@
delete decoder;
}
- return new Common::MemoryReadStream(uncompressedData, hdr->origSize, DisposeAfterUse::YES);
+ return new Common::MemoryReadStream(uncompressedData, hdr->origSize, DisposeAfterUse::YES);
}
Archive *makeArjArchive(const String &name) {
Modified: scummvm/trunk/common/util.cpp
===================================================================
--- scummvm/trunk/common/util.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/common/util.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -345,7 +345,7 @@
uint32 parseGameGUIOptions(const String &str) {
uint32 res = 0;
-
+
for (int i = 0; g_gameOptions[i].desc; i++)
if (str.contains(g_gameOptions[i].desc))
res |= g_gameOptions[i].option;
Modified: scummvm/trunk/graphics/video/dxa_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/dxa_decoder.h 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/graphics/video/dxa_decoder.h 2010-07-21 18:17:51 UTC (rev 51094)
@@ -45,7 +45,7 @@
bool load(Common::SeekableReadStream &stream);
void close();
-
+
bool isVideoLoaded() const { return _fileStream != 0; }
uint16 getWidth() const { return _width; }
uint16 getHeight() const { return _height; }
Modified: scummvm/trunk/graphics/video/flic_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/flic_decoder.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/graphics/video/flic_decoder.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -57,7 +57,7 @@
return false;
}
-
+
_frameCount = _fileStream->readUint16LE();
uint16 width = _fileStream->readUint16LE();
uint16 height = _fileStream->readUint16LE();
@@ -265,7 +265,7 @@
delete[] data;
}
}
-
+
_curFrame++;
if (_curFrame == 0)
Modified: scummvm/trunk/graphics/video/qt_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/qt_decoder.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/graphics/video/qt_decoder.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -206,7 +206,7 @@
void QuickTimeDecoder::pauseVideoIntern(bool pause) {
if (_audStream)
- g_system->getMixer()->pauseHandle(_audHandle, pause);
+ g_system->getMixer()->pauseHandle(_audHandle, pause);
}
Surface *QuickTimeDecoder::decodeNextFrame() {
Modified: scummvm/trunk/graphics/video/video_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/video_decoder.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/graphics/video/video_decoder.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -64,7 +64,7 @@
delete[] sysPalette;
}
-bool VideoDecoder::needsUpdate() const {
+bool VideoDecoder::needsUpdate() const {
return !endOfVideo() && getTimeToNextFrame() == 0;
}
Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/gui/ThemeEngine.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -1229,7 +1229,7 @@
src += state->backBuffer.pitch;
dst += _backBuffer.pitch;
}
-
+
addDirtyRect(state->r);
}
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/gui/options.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -790,7 +790,7 @@
return true;
if (_domain != Common::ConfigManager::kApplicationDomain || ConfMan.hasKey(setting, _domain) || preferredType) {
- const Common::String drv = ConfMan.get(setting, (_domain != Common::ConfigManager::kApplicationDomain && !ConfMan.hasKey(setting, _domain)) ? Common::ConfigManager::kApplicationDomain : _domain);
+ const Common::String drv = ConfMan.get(setting, (_domain != Common::ConfigManager::kApplicationDomain && !ConfMan.hasKey(setting, _domain)) ? Common::ConfigManager::kApplicationDomain : _domain);
const MusicPlugin::List p = MusicMan.getPlugins();
for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) {
@@ -810,7 +810,7 @@
void OptionsDialog::saveMusicDeviceSetting(PopUpWidget *popup, Common::String setting) {
if (!popup || !_enableAudioSettings)
return;
-
+
const MusicPlugin::List p = MusicMan.getPlugins();
bool found = false;
for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end() && !found; ++m) {
Modified: scummvm/trunk/gui/widget.cpp
===================================================================
--- scummvm/trunk/gui/widget.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/gui/widget.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -218,9 +218,9 @@
for (uint i = 0; i < label.size() ; i++)
if (label[i] != '~')
res = res + label[i];
-
+
return res;
-}
+}
#pragma mark -
@@ -361,7 +361,7 @@
}
ButtonWidget::ButtonWidget(GuiObject *boss, const Common::String &name, const Common::String &label, const char *tooltip, uint32 cmd, uint8 hotkey)
- : StaticTextWidget(boss, name, cleanupHotkey(label), tooltip), CommandSender(boss),
+ : StaticTextWidget(boss, name, cleanupHotkey(label), tooltip), CommandSender(boss),
_cmd(cmd) {
if (hotkey == 0)
_hotkey = parseHotkey(label);
Modified: scummvm/trunk/gui/widget.h
===================================================================
--- scummvm/trunk/gui/widget.h 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/gui/widget.h 2010-07-21 18:17:51 UTC (rev 51094)
@@ -164,7 +164,7 @@
class Tooltip : public GuiObject {
public:
Tooltip(GuiManager *guiManager);
-
+
bool isVisible() const { return _visible; }
void draw();
void reflowLayout();
@@ -272,7 +272,7 @@
protected:
bool _state;
int _value;
-
+
public:
RadiobuttonWidget(GuiObject *boss, int x, int y, int w, int h, RadiobuttonGroup *group, int value, const Common::String &label, const char *tooltip = 0, uint8 hotkey = 0);
RadiobuttonWidget(GuiObject *boss, const Common::String &name, RadiobuttonGroup *group, int value, const Common::String &label, const char *tooltip = 0, uint8 hotkey = 0);
Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/sound/audiostream.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -393,7 +393,7 @@
//
// An example is when converting the timestamp 500ms to a 11025 Hz based
// stream. It would have an internal frame counter of 5512.5. Now when
- // doing calculations at frame precision, this might lead to unexpected
+ // doing calculations at frame precision, this might lead to unexpected
// results: The frame difference between a timestamp 1000ms and the above
// mentioned timestamp (both with 11025 as framerate) would be 5512,
// instead of 5513, which is what a frame-precision based code would expect.
Modified: scummvm/trunk/sound/decoders/mp3.cpp
===================================================================
--- scummvm/trunk/sound/decoders/mp3.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/sound/decoders/mp3.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -349,13 +349,13 @@
SeekableAudioStream *makeMP3Stream(
Common::SeekableReadStream *stream,
DisposeAfterUse::Flag disposeAfterUse) {
-
+
#if defined(__PSP__)
SeekableAudioStream *s = 0;
-
+
if (Mp3PspStream::isOkToCreateStream())
s = new Mp3PspStream(stream, disposeAfterUse);
-
+
if (!s) // go to regular MAD mp3 stream if ME fails
s = new MP3Stream(stream, disposeAfterUse);
#else
Modified: scummvm/trunk/sound/mididrv.cpp
===================================================================
--- scummvm/trunk/sound/mididrv.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/sound/mididrv.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -94,7 +94,7 @@
}
}
}
-
+
return MT_INVALID;
}
@@ -139,7 +139,7 @@
if (flags & MDT_PCJR)
return hdl;
break;
-
+
case MT_CMS:
if (flags & MDT_CMS)
return hdl;
@@ -149,7 +149,7 @@
if (flags & MDT_ADLIB)
return hdl;
break;
-
+
case MT_TOWNS:
if (flags & MDT_TOWNS)
return hdl;
Modified: scummvm/trunk/sound/mididrv.h
===================================================================
--- scummvm/trunk/sound/mididrv.h 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/sound/mididrv.h 2010-07-21 18:17:51 UTC (rev 51094)
@@ -124,7 +124,7 @@
/** Returns device handle based on the present devices and the flags parameter. */
static DeviceHandle detectDevice(int flags);
-
+
/** Find the music driver matching the given driver name/description. */
static DeviceHandle getDeviceHandle(const Common::String &identifier);
Modified: scummvm/trunk/sound/musicplugin.h
===================================================================
--- scummvm/trunk/sound/musicplugin.h 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/sound/musicplugin.h 2010-07-21 18:17:51 UTC (rev 51094)
@@ -50,7 +50,7 @@
* device name (if it isn't the default one) and the name of the driver.
*/
Common::String getCompleteName();
-
+
/**
* Returns a user readable string that contains the name of the current
* device name (if it isn't the default one) and the id of the driver.
Modified: scummvm/trunk/sound/softsynth/mt32.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32.cpp 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/sound/softsynth/mt32.cpp 2010-07-21 18:17:51 UTC (rev 51094)
@@ -149,7 +149,7 @@
Common::Rect r(x, y, x + w, y + h);
uint32 col;
-
+
if (screenFormat.bytesPerPixel > 1)
col = screenFormat.RGBToColor(0, 171, 0);
else
@@ -184,7 +184,7 @@
uint16 y = g_system->getHeight() / 2 - h / 2 + offset * (h + 1);
uint32 col;
-
+
if (screenFormat.bytesPerPixel > 1)
col = screenFormat.RGBToColor(0, 0, 0);
else
Modified: scummvm/trunk/test/common/tokenizer.h
===================================================================
--- scummvm/trunk/test/common/tokenizer.h 2010-07-21 18:15:39 UTC (rev 51093)
+++ scummvm/trunk/test/common/tokenizer.h 2010-07-21 18:17:51 UTC (rev 51094)
@@ -5,7 +5,7 @@
class TokenizerTestSuite : public CxxTest::TestSuite {
public:
void test_nextToken() {
-
+
// test normal behavior
Common::StringTokenizer strTokenizer("Now, this is a test!", " ,!");
Common::String tokenArray[] = {"Now", "this", "is", "a", "test"};
@@ -17,7 +17,7 @@
TS_ASSERT(strTokenizer.empty());
// Test edge cases:
-
+
// empty string
Common::StringTokenizer s1("");
TS_ASSERT_EQUALS("", s1.nextToken());
@@ -37,7 +37,7 @@
TS_ASSERT_EQUALS("af", s4.nextToken());
}
- void test_resetAndEmpty() {
+ void test_resetAndEmpty() {
Common::StringTokenizer strTokenizer("Just, another test!", " ,!");
// test reset()
@@ -48,10 +48,10 @@
TS_ASSERT_EQUALS(token2, "Just");
// test empty()
- TS_ASSERT(!strTokenizer.empty());
+ TS_ASSERT(!strTokenizer.empty());
strTokenizer.nextToken(); //another
strTokenizer.nextToken(); //test
- TS_ASSERT(strTokenizer.empty());
+ TS_ASSERT(strTokenizer.empty());
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list