[Scummvm-cvs-logs] SF.net SVN: scummvm: [31929] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed May 7 17:09:11 CEST 2008
Revision: 31929
http://scummvm.svn.sourceforge.net/scummvm/?rev=31929&view=rev
Author: lordhoto
Date: 2008-05-07 08:09:10 -0700 (Wed, 07 May 2008)
Log Message:
-----------
Proper delete[] formatting (this time all occurences should've been changed...)
Modified Paths:
--------------
scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
scummvm/trunk/common/array.h
scummvm/trunk/engines/scumm/smush/channel.cpp
scummvm/trunk/engines/scumm/smush/codec37.cpp
scummvm/trunk/engines/scumm/smush/imuse_channel.cpp
scummvm/trunk/engines/scumm/smush/saud_channel.cpp
scummvm/trunk/engines/scumm/smush/smush_player.cpp
scummvm/trunk/graphics/cursorman.h
scummvm/trunk/test/cxxtest/sample/CreatedTest.h
scummvm/trunk/test/cxxtest/sample/FixtureTest.h
scummvm/trunk/tools/create_kyradat/pak.h
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2008-05-07 15:09:10 UTC (rev 31929)
@@ -142,7 +142,7 @@
}
OSystem_SDL_Symbian::~OSystem_SDL_Symbian() {
- delete[]_stereo_mix_buffer;
+ delete[] _stereo_mix_buffer;
}
int OSystem_SDL_Symbian::getDefaultGraphicsMode() const {
Modified: scummvm/trunk/common/array.h
===================================================================
--- scummvm/trunk/common/array.h 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/common/array.h 2008-05-07 15:09:10 UTC (rev 31929)
@@ -99,7 +99,7 @@
if (this == &array)
return *this;
- delete [] _data;
+ delete[] _data;
_size = array._size;
_capacity = _size + 32;
_data = new T[_capacity];
@@ -113,7 +113,7 @@
}
void clear() {
- delete [] _data;
+ delete[] _data;
_data = 0;
_size = 0;
_capacity = 0;
@@ -151,7 +151,7 @@
if (old_data) {
// Copy old data
copy(old_data, old_data + _size, _data);
- delete [] old_data;
+ delete[] old_data;
}
}
@@ -166,7 +166,7 @@
// Copy old data
int cnt = (_size < newSize ? _size : newSize);
copy(old_data, old_data + cnt, _data);
- delete [] old_data;
+ delete[] old_data;
}
_size = newSize;
}
Modified: scummvm/trunk/engines/scumm/smush/channel.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/channel.cpp 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/engines/scumm/smush/channel.cpp 2008-05-07 15:09:10 UTC (rev 31929)
@@ -70,7 +70,7 @@
_tbufferSize = 0;
}
if (_sbufferSize == 0) {
- delete[]_sbuffer;
+ delete[] _sbuffer;
_sbuffer = 0;
}
} else {
@@ -90,7 +90,7 @@
if (!_sbuffer)
error("smush channel failed to allocate memory");
memcpy(_sbuffer, _tbuffer + offset, _sbufferSize);
- delete[]_tbuffer;
+ delete[] _tbuffer;
_tbuffer = 0;
_tbufferSize = 0;
} else {
@@ -102,7 +102,7 @@
error("smush channel failed to allocate memory");
memcpy(_tbuffer, old + offset, new_size);
_tbufferSize = new_size;
- delete[]old;
+ delete[] old;
}
}
}
Modified: scummvm/trunk/engines/scumm/smush/codec37.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/codec37.cpp 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/engines/scumm/smush/codec37.cpp 2008-05-07 15:09:10 UTC (rev 31929)
@@ -52,7 +52,7 @@
Codec37Decoder::~Codec37Decoder() {
if (_offsetTable) {
- delete[]_offsetTable;
+ delete[] _offsetTable;
_offsetTable = 0;
_tableLastPitch = -1;
_tableLastIndex = -1;
Modified: scummvm/trunk/engines/scumm/smush/imuse_channel.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/imuse_channel.cpp 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/engines/scumm/smush/imuse_channel.cpp 2008-05-07 15:09:10 UTC (rev 31929)
@@ -83,7 +83,7 @@
if (!_tbuffer)
error("imuse_channel failed to allocate memory");
memcpy(_tbuffer, old, _tbufferSize);
- delete[]old;
+ delete[] old;
b.read(_tbuffer + _tbufferSize, size);
_tbufferSize += size;
} else {
@@ -155,7 +155,7 @@
_tbuffer = new byte[new_size];
if (!_tbuffer) error("imuse_channel failed to allocate memory");
memcpy(_tbuffer, old, _tbufferSize);
- delete[]old;
+ delete[] old;
memcpy(_tbuffer + _tbufferSize, _sbuffer + _sbufferSize - remaining_size, remaining_size);
_tbufferSize += remaining_size;
}
@@ -180,7 +180,7 @@
value = ((((v2 & 0xf0) << 4) | v3) << 4) - 0x8000;
WRITE_BE_UINT16(decoded, value); decoded += 2;
}
- delete[]_sbuffer;
+ delete[] _sbuffer;
_sbuffer = (byte *)keep;
_sbufferSize = new_size;
}
Modified: scummvm/trunk/engines/scumm/smush/saud_channel.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/saud_channel.cpp 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/engines/scumm/smush/saud_channel.cpp 2008-05-07 15:09:10 UTC (rev 31929)
@@ -135,7 +135,7 @@
if (!_tbuffer)
error("saud_channel failed to allocate memory");
memcpy(_tbuffer, old, _tbufferSize);
- delete[]old;
+ delete[] old;
b.read(_tbuffer + _tbufferSize, size);
_tbufferSize += size;
} else {
Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp 2008-05-07 15:09:10 UTC (rev 31929)
@@ -86,7 +86,7 @@
}
~StringResource() {
for (int32 i = 0; i < _nbStrings; i++) {
- delete[]_strings[i].string;
+ delete[] _strings[i].string;
}
}
@@ -206,7 +206,7 @@
StringResource *sr = new StringResource;
assert(sr);
sr->init(filebuffer, length);
- delete[]filebuffer;
+ delete[] filebuffer;
return sr;
}
Modified: scummvm/trunk/graphics/cursorman.h
===================================================================
--- scummvm/trunk/graphics/cursorman.h 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/graphics/cursorman.h 2008-05-07 15:09:10 UTC (rev 31929)
@@ -152,7 +152,7 @@
}
~Cursor() {
- delete [] _data;
+ delete[] _data;
}
};
@@ -180,7 +180,7 @@
}
~Palette() {
- delete [] _data;
+ delete[] _data;
}
};
Modified: scummvm/trunk/test/cxxtest/sample/CreatedTest.h
===================================================================
--- scummvm/trunk/test/cxxtest/sample/CreatedTest.h 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/test/cxxtest/sample/CreatedTest.h 2008-05-07 15:09:10 UTC (rev 31929)
@@ -16,7 +16,7 @@
char *_buffer;
public:
CreatedTest( unsigned size ) : _buffer( new char[size] ) {}
- virtual ~CreatedTest() { delete [] _buffer; }
+ virtual ~CreatedTest() { delete[] _buffer; }
static CreatedTest *createSuite() { return new CreatedTest( 16 ); }
static void destroySuite( CreatedTest *suite ) { delete suite; }
Modified: scummvm/trunk/test/cxxtest/sample/FixtureTest.h
===================================================================
--- scummvm/trunk/test/cxxtest/sample/FixtureTest.h 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/test/cxxtest/sample/FixtureTest.h 2008-05-07 15:09:10 UTC (rev 31929)
@@ -22,7 +22,7 @@
void tearDown()
{
- delete [] _buffer;
+ delete[] _buffer;
}
void test_strcpy()
Modified: scummvm/trunk/tools/create_kyradat/pak.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/pak.h 2008-05-07 14:49:42 UTC (rev 31928)
+++ scummvm/trunk/tools/create_kyradat/pak.h 2008-05-07 15:09:10 UTC (rev 31929)
@@ -53,8 +53,8 @@
struct FileList {
FileList() : filename(0), size(0), data(0), next(0) {}
~FileList() {
- delete [] filename;
- delete [] data;
+ delete[] filename;
+ delete[] data;
delete next;
}
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