WINTERMUTE: "delete []" -> "delete[]"

48 files changed, 105 insertions, 105 deletions

diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index bfc21c6ccc..fc28293ac8 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -132,7 +132,7 @@ bool AdActor::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ACTOR file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

@@ -1287,7 +1287,7 @@ bool AdActor::mergeAnims(const char *animsFilename) {
 		break;

 		}

 	}

-	delete [] fileBuffer;

+	delete[] fileBuffer;

 	return Ret;

 }

 

diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 80c52de71a..a4b94d062f 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -97,7 +97,7 @@ bool AdEntity::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ENTITY file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index d75f41e38e..1df34e74bd 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -128,12 +128,12 @@ bool AdGame::cleanup() {
 

 

 	for (i = 0; i < _dlgPendingBranches.getSize(); i++) {

-		delete [] _dlgPendingBranches[i];

+		delete[] _dlgPendingBranches[i];

 	}

 	_dlgPendingBranches.removeAll();

 

 	for (i = 0; i < _speechDirs.getSize(); i++) {

-		delete [] _speechDirs[i];

+		delete[] _speechDirs[i];

 	}

 	_speechDirs.removeAll();

 

@@ -1117,7 +1117,7 @@ bool AdGame::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing GAME file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

@@ -1387,7 +1387,7 @@ bool AdGame::loadItemsFile(const char *filename, bool merge) {
 	if (DID_FAIL(ret = loadItemsBuffer(buffer, merge))) _gameRef->LOG(0, "Error parsing ITEMS file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

@@ -1451,7 +1451,7 @@ AdSceneState *AdGame::getSceneState(const char *filename, bool saving) {
 

 	for (int i = 0; i < _sceneStates.getSize(); i++) {

 		if (scumm_stricmp(_sceneStates[i]->_filename, filenameCor) == 0) {

-			delete [] filenameCor;

+			delete[] filenameCor;

 			return _sceneStates[i];

 		}

 	}

@@ -1462,10 +1462,10 @@ AdSceneState *AdGame::getSceneState(const char *filename, bool saving) {
 

 		_sceneStates.add(ret);

 

-		delete [] filenameCor;

+		delete[] filenameCor;

 		return ret;

 	} else {

-		delete [] filenameCor;

+		delete[] filenameCor;

 		return NULL;

 	}

 }

@@ -1563,7 +1563,7 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const
 	if (startIndex >= 0) {

 		for (int i = startIndex; i < _dlgPendingBranches.getSize(); i++) {

 			//ClearBranchResponses(_dlgPendingBranches[i]);

-			delete [] _dlgPendingBranches[i];

+			delete[] _dlgPendingBranches[i];

 			_dlgPendingBranches[i] = NULL;

 		}

 		_dlgPendingBranches.removeAt(startIndex, _dlgPendingBranches.getSize() - startIndex);

@@ -1575,7 +1575,7 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const
 		_responsesBranch.removeAll();

 	}

 

-	if (deleteName) delete [] name;

+	if (deleteName) delete[] name;

 

 	return STATUS_OK;

 }

@@ -1795,7 +1795,7 @@ bool AdGame::addItem(AdItem *item) {
 bool AdGame::resetContent() {

 	// clear pending dialogs

 	for (int i = 0; i < _dlgPendingBranches.getSize(); i++) {

-		delete [] _dlgPendingBranches[i];

+		delete[] _dlgPendingBranches[i];

 	}

 	_dlgPendingBranches.removeAll();

 

@@ -1862,7 +1862,7 @@ bool AdGame::addSpeechDir(const char *dir) {
 

 	for (int i = 0; i < _speechDirs.getSize(); i++) {

 		if (scumm_stricmp(_speechDirs[i], temp) == 0) {

-			delete [] temp;

+			delete[] temp;

 			return STATUS_OK;

 		}

 	}

@@ -1884,13 +1884,13 @@ bool AdGame::removeSpeechDir(const char *dir) {
 	bool Found = false;

 	for (int i = 0; i < _speechDirs.getSize(); i++) {

 		if (scumm_stricmp(_speechDirs[i], temp) == 0) {

-			delete [] _speechDirs[i];

+			delete[] _speechDirs[i];

 			_speechDirs.removeAt(i);

 			Found = true;

 			break;

 		}

 	}

-	delete [] temp;

+	delete[] temp;

 

 	if (Found) return STATUS_OK;

 	else return STATUS_FAILED;

@@ -1910,7 +1910,7 @@ char *AdGame::findSpeechFile(char *stringID) {
 		if (_fileManager->hasFile(ret))

 			return ret;

 	}

-	delete [] ret;

+	delete[] ret;

 	return NULL;

 }

 

diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 38e06535d9..60607c71c6 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -169,7 +169,7 @@ bool AdInventoryBox::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing INVENTORY_BOX file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index ec9fa3c14c..e9a1bb4353 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -97,7 +97,7 @@ bool AdItem::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ITEM file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index 38894a0e88..0a93edfb35 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -73,7 +73,7 @@ bool AdLayer::loadFile(const char *filename) {
 

 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing LAYER file '%s'", filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index 84f13dc989..fdbc987158 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -853,7 +853,7 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
 		char *key = _gameRef->_stringTable->getKey(text);

 		if (key) {

 			sound = ((AdGame *)_gameRef)->findSpeechFile(key);

-			delete [] key;

+			delete[] key;

 

 			if (sound) deleteSound = true;

 		}

@@ -931,7 +931,7 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
 

 	_state = STATE_TALKING;

 

-	if (deleteSound) delete [] sound;

+	if (deleteSound) delete[] sound;

 }

 

 

diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp
index a23c000137..eec25b2aaa 100644
--- a/engines/wintermute/ad/ad_region.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -67,7 +67,7 @@ bool AdRegion::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing REGION file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 90582ce811..22b40f3ea4 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -200,7 +200,7 @@ bool AdResponseBox::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing RESPONSE_BOX file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_rot_level.cpp b/engines/wintermute/ad/ad_rot_level.cpp
index 6f3ffdaeb5..72fcaeff28 100644
--- a/engines/wintermute/ad/ad_rot_level.cpp
+++ b/engines/wintermute/ad/ad_rot_level.cpp
@@ -66,7 +66,7 @@ bool AdRotLevel::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ROTATION_LEVEL file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_scale_level.cpp b/engines/wintermute/ad/ad_scale_level.cpp
index 1adf4266b2..c390c6dc08 100644
--- a/engines/wintermute/ad/ad_scale_level.cpp
+++ b/engines/wintermute/ad/ad_scale_level.cpp
@@ -64,7 +64,7 @@ bool AdScaleLevel::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing SCALE_LEVEL file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index a802039550..dd69db3d68 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -514,7 +514,7 @@ bool AdScene::loadFile(const char *filename) {
 

 	setFilename(filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
index 452c2587d4..a011db3f02 100644
--- a/engines/wintermute/ad/ad_sentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -91,7 +91,7 @@ AdSentence::~AdSentence() {
 

 //////////////////////////////////////////////////////////////////////////

 void AdSentence::setText(const char *text) {

-	if (_text) delete [] _text;

+	if (_text) delete[] _text;

 	_text = new char[strlen(text) + 1];

 	if (_text) strcpy(_text, text);

 }

@@ -99,7 +99,7 @@ void AdSentence::setText(const char *text) {
 

 //////////////////////////////////////////////////////////////////////////

 void AdSentence::setStances(const char *stances) {

-	if (_stances) delete [] _stances;

+	if (_stances) delete[] _stances;

 	if (stances) {

 		_stances = new char[strlen(stances) + 1];

 		if (_stances) strcpy(_stances, stances);

@@ -124,7 +124,7 @@ char *AdSentence::getNextStance() {
 char *AdSentence::getStance(int stance) {

 	if (_stances == NULL) return NULL;

 

-	if (_tempStance) delete [] _tempStance;

+	if (_tempStance) delete[] _tempStance;

 	_tempStance = NULL;

 

 	char *start;

diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
index e158b6115a..fcbf9af4eb 100644
--- a/engines/wintermute/ad/ad_sprite_set.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -69,7 +69,7 @@ bool AdSpriteSet::loadFile(const char *filename, int lifeTime, TSpriteCacheType
 

 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing SPRITESET file '%s'", filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp
index cfbefd39d4..2b0c6c6c1b 100644
--- a/engines/wintermute/ad/ad_talk_def.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -81,7 +81,7 @@ bool AdTalkDef::loadFile(const char *filename) {
 

 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing TALK file '%s'", filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index 28ce2967dd..7e5d8d29c6 100644
--- a/engines/wintermute/ad/ad_waypoint_group.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -78,7 +78,7 @@ bool AdWaypointGroup::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing WAYPOINTS file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 156aff61fe..b25bbf024d 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -101,7 +101,7 @@ byte *BaseFileManager::readWholeFile(const Common::String &filename, uint32 *siz
 	if (file->read(buffer, (uint32)file->size()) != (uint32)file->size()) {

 		debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "Error reading file '%s'", filename.c_str());

 		closeFile(file);

-		delete [] buffer;

+		delete[] buffer;

 		return NULL;

 	};

 

diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp
index 8278c48299..77e959f11b 100644
--- a/engines/wintermute/base/base_frame.cpp
+++ b/engines/wintermute/base/base_frame.cpp
@@ -552,7 +552,7 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac
 		const char *event = stack->pop()->getString();

 		for (int i = 0; i < _applyEvent.getSize(); i++) {

 			if (scumm_stricmp(_applyEvent[i], event) == 0) {

-				delete [] _applyEvent[i];

+				delete[] _applyEvent[i];

 				_applyEvent.removeAt(i);

 				break;

 			}

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 756a28ad7b..b11915afc7 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -682,7 +682,7 @@ bool BaseGame::loadFile(const char *filename) {
 

 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing GAME file '%s'", filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

@@ -1088,7 +1088,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 		strcpy(str, val->getString());

 		_stringTable->expand(&str);

 		stack->pushString(str);

-		delete [] str;

+		delete[] str;

 		return STATUS_OK;

 	}

 

@@ -1518,7 +1518,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 			stack->pop();

 			stack->pushBool(false);

 		}

-		delete [] desc;

+		delete[] desc;

 		return STATUS_OK;

 	}

 

@@ -3098,7 +3098,7 @@ bool BaseGame::ExternalCall(ScScript *script, ScStack *stack, ScStack *thisStack
 		char *str2 = new char[strlen(str) + 1];

 		strcpy(str2, str);

 		stack->pushString(str2);

-		delete [] str2;

+		delete[] str2;

 	}

 

 	//////////////////////////////////////////////////////////////////////////

@@ -3536,7 +3536,7 @@ bool BaseGame::loadSettings(const char *filename) {
 	_compressedSavegames = _registry->readBool("Debug", "CompressedSavegames", _compressedSavegames);

 	//_compressedSavegames = false;

 

-	delete [] origBuffer;

+	delete[] origBuffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp
index b7a221daf5..588d210134 100644
--- a/engines/wintermute/base/base_parser.cpp
+++ b/engines/wintermute/base/base_parser.cpp
@@ -50,7 +50,7 @@ BaseParser::BaseParser(BaseGame *inGame): BaseClass(inGame) {
 

 //////////////////////////////////////////////////////////////////////

 BaseParser::~BaseParser() {

-	if (_whiteSpace != NULL) delete [] _whiteSpace;

+	if (_whiteSpace != NULL) delete[] _whiteSpace;

 }

 

 

diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp
index 44d2fc00ba..3f9e8de855 100644
--- a/engines/wintermute/base/base_persistence_manager.cpp
+++ b/engines/wintermute/base/base_persistence_manager.cpp
@@ -91,7 +91,7 @@ BasePersistenceManager::~BasePersistenceManager() {
 void BasePersistenceManager::cleanup() {

 	/*  if (_buffer) {

 	        if (_saving) free(_buffer);

-	        else delete [] _buffer; // allocated by file manager

+	        else delete[] _buffer; // allocated by file manager

 	    }

 	    _buffer = NULL;

 

@@ -110,7 +110,7 @@ void BasePersistenceManager::cleanup() {
 

 	_thumbnailDataSize = 0;

 	if (_thumbnailData) {

-		delete [] _thumbnailData;

+		delete[] _thumbnailData;

 		_thumbnailData = NULL;

 	}

 

diff --git a/engines/wintermute/base/base_quick_msg.cpp b/engines/wintermute/base/base_quick_msg.cpp
index 6e435b3ee0..d672e39c6b 100644
--- a/engines/wintermute/base/base_quick_msg.cpp
+++ b/engines/wintermute/base/base_quick_msg.cpp
@@ -41,7 +41,7 @@ BaseQuickMsg::BaseQuickMsg(BaseGame *inGame, const char *text): BaseClass(inGame
 

 //////////////////////////////////////////////////////////////////////////

 BaseQuickMsg::~BaseQuickMsg() {

-	if (_text) delete [] _text;

+	if (_text) delete[] _text;

 }

 

 

diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp
index 22b5a99937..f88de2ab91 100644
--- a/engines/wintermute/base/base_region.cpp
+++ b/engines/wintermute/base/base_region.cpp
@@ -108,7 +108,7 @@ bool BaseRegion::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing REGION file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index 62ed4f67f2..d274f9df73 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -72,7 +72,7 @@ bool BaseScriptHolder::cleanup() {
 //////////////////////////////////////////////////////////////////////

 void BaseScriptHolder::setFilename(const char *filename) {

 	if (_filename != NULL) {

-		delete [] _filename;

+		delete[] _filename;

 		_filename = NULL;

 	}

 	if (filename == NULL)

diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index 86dbefdd70..3514504824 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -155,7 +155,7 @@ bool BaseSprite::loadFile(const char *filename, int lifeTime, TSpriteCacheType c
 		byte *buffer = _gameRef->_fileManager->readWholeFile(filename);

 		if (buffer) {

 			if (DID_FAIL(ret = loadBuffer(buffer, true, lifeTime, cacheType))) _gameRef->LOG(0, "Error parsing SPRITE file '%s'", filename);

-			delete [] buffer;

+			delete[] buffer;

 		}

 	}

 

diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 35546b0001..1598101036 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -150,7 +150,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
 			byte *data = new byte[uncompSize];

 			if (!data) {

 				error("Error allocating buffer for file '%s'", filename.c_str());

-				delete [] compBuffer;

+				delete[] compBuffer;

 				delete file;

 				return NULL;

 			}

@@ -159,12 +159,12 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
 

 			if (Common::uncompress(data, (unsigned long *)&uncompSize, compBuffer, compSize) != true) {

 				error("Error uncompressing file '%s'", filename.c_str());

-				delete [] compBuffer;

+				delete[] compBuffer;

 				delete file;

 				return NULL;

 			}

 

-			delete [] compBuffer;

+			delete[] compBuffer;

 

 			return new Common::MemoryReadStream(data, uncompSize, DisposeAfterUse::YES);

 			delete file;

diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp
index 899265a2fb..0a0d0cac09 100644
--- a/engines/wintermute/base/file/base_save_thumb_file.cpp
+++ b/engines/wintermute/base/file/base_save_thumb_file.cpp
@@ -66,7 +66,7 @@ bool BaseSaveThumbFile::open(const Common::String &filename) {
 

 	// get slot number from name

 	int slot = atoi(tempFilename);

-	delete [] tempFilename;

+	delete[] tempFilename;

 

 	BasePersistenceManager *pm = new BasePersistenceManager(_gameRef);

 	Common::String slotFilename = pm->getFilenameForSlot(slot);

diff --git a/engines/wintermute/base/font/base_font.cpp b/engines/wintermute/base/font/base_font.cpp
index e9d245782a..7bffbc35c8 100644
--- a/engines/wintermute/base/font/base_font.cpp
+++ b/engines/wintermute/base/font/base_font.cpp
@@ -85,7 +85,7 @@ bool BaseFont::loadFile(const char * Filename)
 

     if(DID_FAIL(ret = loadBuffer(Buffer))) _gameRef->LOG(0, "Error parsing FONT file '%s'", filename);

 

-    delete [] Buffer;

+    delete[] Buffer;

 

     return ret;

 }

@@ -198,7 +198,7 @@ bool BaseFont::isTrueType(BaseGame *gameRef, const char *filename) {
 	if (parser.getCommand((char **)&WorkBuffer, commands, (char **)&params) == TOKEN_TTFONT)

 		ret = true;

 

-	delete [] buffer;

+	delete[] buffer;

 	return ret;

 }

 

diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index 2e752d4f2e..dd6c6da327 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -255,7 +255,7 @@ bool BaseFontBitmap::loadFile(const char *filename) {
 

 	if (DID_FAIL(ret = loadBuffer(buffer))) _gameRef->LOG(0, "Error parsing FONT file '%s'", filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index c371177bac..dd5d006556 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -419,7 +419,7 @@ bool BaseFontTT::loadFile(const char *filename) {
 

 	if (DID_FAIL(ret = loadBuffer(buffer))) _gameRef->LOG(0, "Error parsing TTFONT file '%s'", filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 6bfff0799e..1ddefec610 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -106,7 +106,7 @@ PartEmitter::~PartEmitter(void) {
 

 

 	for (int i = 0; i < _sprites.getSize(); i++) {

-		delete [] _sprites[i];

+		delete[] _sprites[i];

 	}

 	_sprites.removeAll();

 

@@ -141,7 +141,7 @@ bool PartEmitter::addSprite(const char *filename) {
 bool PartEmitter::removeSprite(const char *filename) {

 	for (int i = 0; i < _sprites.getSize(); i++) {

 		if (scumm_stricmp(filename, _sprites[i]) == 0) {

-			delete [] _sprites[i];

+			delete[] _sprites[i];

 			_sprites.removeAt(i);

 			return STATUS_OK;

 		}

diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 52490c0710..57e08135ed 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -360,13 +360,13 @@ bool ScScript::createMethodThread(ScScript *original, const char *methodName) {
 

 //////////////////////////////////////////////////////////////////////////

 void ScScript::cleanup() {

-	if (_buffer) delete [] _buffer;

+	if (_buffer) delete[] _buffer;

 	_buffer = NULL;

 

-	if (_filename) delete [] _filename;

+	if (_filename) delete[] _filename;

 	_filename = NULL;

 

-	if (_symbols) delete [] _symbols;

+	if (_symbols) delete[] _symbols;

 	_symbols = NULL;

 	_numSymbols = 0;

 

@@ -385,24 +385,24 @@ void ScScript::cleanup() {
 	delete _stack;

 	_stack = NULL;

 

-	if (_functions) delete [] _functions;

+	if (_functions) delete[] _functions;

 	_functions = NULL;

 	_numFunctions = 0;

 

-	if (_methods) delete [] _methods;

+	if (_methods) delete[] _methods;

 	_methods = NULL;

 	_numMethods = 0;

 

-	if (_events) delete [] _events;

+	if (_events) delete[] _events;

 	_events = NULL;

 	_numEvents = 0;

 

 

 	if (_externals) {

 		for (uint32 i = 0; i < _numExternals; i++) {

-			if (_externals[i].nu_params > 0) delete [] _externals[i].params;

+			if (_externals[i].nu_params > 0) delete[] _externals[i].params;

 		}

-		delete [] _externals;

+		delete[] _externals;

 	}

 	_externals = NULL;

 	_numExternals = 0;

@@ -586,7 +586,7 @@ bool ScScript::executeInstruction() {
 					runtimeError("Cannot call method '%s'. Ignored.", MethodName);

 					_stack->pushNULL();

 				}

-				delete [] MethodName;

+				delete[] MethodName;

 				break;

 			}

 			/*

@@ -621,7 +621,7 @@ bool ScScript::executeInstruction() {
 				}

 			}

 		}

-		delete [] MethodName;

+		delete[] MethodName;

 	}

 	break;

 

@@ -797,7 +797,7 @@ bool ScScript::executeInstruction() {
 			strcpy(tempStr, op1->getString());

 			strcat(tempStr, op2->getString());

 			_operand->setString(tempStr);

-			delete [] tempStr;

+			delete[] tempStr;

 		} else if (op1->getType() == VAL_INT && op2->getType() == VAL_INT)

 			_operand->setInt(op1->getInt() + op2->getInt());

 		else _operand->setFloat(op1->getFloat() + op2->getFloat());

diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index 59ec113d1f..c33d844aa1 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -127,7 +127,7 @@ byte *ScEngine::loadFile(void *data, char *filename, uint32 *size) {
 

 //////////////////////////////////////////////////////////////////////////

 void ScEngine::closeFile(void *data, byte *buffer) {

-	delete [] buffer;

+	delete[] buffer;

 }

 

 

@@ -201,7 +201,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig
 	} else {

 		if (!_compilerAvailable) {

 			_gameRef->LOG(0, "ScEngine::GetCompiledScript - script '%s' needs to be compiled but compiler is not available", filename);

-			delete [] buffer;

+			delete[] buffer;

 			return NULL;

 		}

 		// This code will never be called, since _compilerAvailable is const false.

@@ -235,7 +235,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig
 

 

 	// cleanup

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/base/scriptables/script_engine.h b/engines/wintermute/base/scriptables/script_engine.h
index 3d85192aa6..e443ec5832 100644
--- a/engines/wintermute/base/scriptables/script_engine.h
+++ b/engines/wintermute/base/scriptables/script_engine.h
@@ -54,7 +54,7 @@ public:
 		};

 

 		~CScCachedScript() {

-			if (_buffer) delete [] _buffer;

+			if (_buffer) delete[] _buffer;

 		};

 

 		uint32 _timestamp;

diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp
index 92943f7485..01179bb3ad 100644
--- a/engines/wintermute/base/scriptables/script_ext_file.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_file.cpp
@@ -457,7 +457,7 @@ bool SXFile::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 					str[size] = '\0';

 					stack->pushString((char *)str);

 				}

-				delete [] str;

+				delete[] str;

 			} else stack->pushNULL();

 		} else stack->pushNULL();

 

diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
index b625fad400..6b791871ad 100644
--- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp
@@ -249,7 +249,7 @@ bool SXMemBuffer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSt
 			strncpy(str, (const char *)_buffer + start, length);

 			str[length] = '\0';

 			stack->pushString(str);

-			delete [] str;

+			delete[] str;

 		}

 		return STATUS_OK;

 	}

diff --git a/engines/wintermute/base/scriptables/script_ext_string.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp
index 5e01e5e29c..385d7ca746 100644
--- a/engines/wintermute/base/scriptables/script_ext_string.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_string.cpp
@@ -67,7 +67,7 @@ SXString::SXString(BaseGame *inGame, ScStack *stack): BaseScriptable(inGame) {
 

 //////////////////////////////////////////////////////////////////////////

 SXString::~SXString() {

-	if (_string) delete [] _string;

+	if (_string) delete[] _string;

 }

 

 

diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp
index 6d12c34914..59e0965f5e 100644
--- a/engines/wintermute/base/scriptables/script_value.cpp
+++ b/engines/wintermute/base/scriptables/script_value.cpp
@@ -122,7 +122,7 @@ ScValue::ScValue(BaseGame *inGame, const char *val): BaseClass(inGame) {
 void ScValue::cleanup(bool ignoreNatives) {

 	deleteProps();

 

-	if (_valString) delete [] _valString;

+	if (_valString) delete[] _valString;

 

 	if (!ignoreNatives) {

 		if (_valNative && !_persistent) {

@@ -425,7 +425,7 @@ void ScValue::setString(const Common::String &val) {
 //////////////////////////////////////////////////////////////////////////

 void ScValue::setStringVal(const char *val) {

 	if (_valString) {

-		delete [] _valString;

+		delete[] _valString;

 		_valString = NULL;

 	}

 

@@ -767,7 +767,7 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) {
 			persistMgr->transfer("", &val);

 

 			_valObject[str] = val;

-			delete [] str;

+			delete[] str;

 		}

 	}

 

diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index a6adfca374..fab724eb06 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -106,7 +106,7 @@ bool UIButton::loadFile(const char *filename) {
 

 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing BUTTON file '%s'", filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp
index e687075a9a..988f56ae17 100644
--- a/engines/wintermute/ui/ui_edit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -103,7 +103,7 @@ bool UIEdit::loadFile(const char *filename) {
 

 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing EDIT file '%s'", filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ui/ui_entity.cpp b/engines/wintermute/ui/ui_entity.cpp
index 0244b104a7..21fa3120ba 100644
--- a/engines/wintermute/ui/ui_entity.cpp
+++ b/engines/wintermute/ui/ui_entity.cpp
@@ -69,7 +69,7 @@ bool UIEntity::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing ENTITY container file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp
index 2b05fea22b..ed58079ad2 100644
--- a/engines/wintermute/ui/ui_object.cpp
+++ b/engines/wintermute/ui/ui_object.cpp
@@ -78,7 +78,7 @@ UIObject::~UIObject() {
 

 	if (_image && !_sharedImages) delete _image;

 

-	if (_text) delete [] _text;

+	if (_text) delete[] _text;

 

 	_focusedWidget = NULL; // ref only

 }

@@ -86,7 +86,7 @@ UIObject::~UIObject() {
 

 //////////////////////////////////////////////////////////////////////////

 void UIObject::setText(const char *text) {

-	if (_text) delete [] _text;

+	if (_text) delete[] _text;

 	_text = new char [strlen(text) + 1];

 	if (_text) {

 		strcpy(_text, text);

diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp
index 3535da0ca5..6d838b8d37 100644
--- a/engines/wintermute/ui/ui_text.cpp
+++ b/engines/wintermute/ui/ui_text.cpp
@@ -107,7 +107,7 @@ bool UIText::loadFile(const char *filename) {
 

 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing STATIC file '%s'", filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp
index 5e1d9675c0..e0b2a75ee4 100644
--- a/engines/wintermute/ui/ui_tiled_image.cpp
+++ b/engines/wintermute/ui/ui_tiled_image.cpp
@@ -132,7 +132,7 @@ bool UITiledImage::loadFile(const char *filename) {
 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing TILED_IMAGE file '%s'", filename);

 

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 4c1068d366..b14c832397 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -227,7 +227,7 @@ bool UIWindow::loadFile(const char *filename) {
 

 	if (DID_FAIL(ret = loadBuffer(buffer, true))) _gameRef->LOG(0, "Error parsing WINDOW file '%s'", filename);

 

-	delete [] buffer;

+	delete[] buffer;

 

 	return ret;

 }

diff --git a/engines/wintermute/utils/string_util.cpp b/engines/wintermute/utils/string_util.cpp
index fcf5620cd7..be6207c3b8 100644
--- a/engines/wintermute/utils/string_util.cpp
+++ b/engines/wintermute/utils/string_util.cpp
@@ -64,12 +64,12 @@ WideString StringUtil::utf8ToWide(const Utf8String &Utf8Str) {
 

 	        ConversionResult res = ConvertUTF8toUTF16(&SourceStart, SourceEnd, &TargetStart, TargetEnd, strictConversion);

 	        if (res != conversionOK) {

-	            delete [] WideStringNative;

+	            delete[] WideStringNative;

 	            return L"";

 	        }

 	        *TargetStart = 0;

 	        WideString ResultString(WideStringNative);

-	        delete [] WideStringNative;

+	        delete[] WideStringNative;

 

 	        return ResultString;

 	    } else if (sizeof(wchar_t) == 4) {

@@ -83,12 +83,12 @@ WideString StringUtil::utf8ToWide(const Utf8String &Utf8Str) {
 

 	        ConversionResult res = ConvertUTF8toUTF32(&SourceStart, SourceEnd, &TargetStart, TargetEnd, strictConversion);

 	        if (res != conversionOK) {

-	            delete [] WideStringNative;

+	            delete[] WideStringNative;

 	            return L"";

 	        }

 	        *TargetStart = 0;

 	        WideString ResultString(WideStringNative);

-	        delete [] WideStringNative;

+	        delete[] WideStringNative;

 

 	        return ResultString;

 	    } else {

@@ -114,12 +114,12 @@ Utf8String StringUtil::wideToUtf8(const WideString &WideStr) {
 

 	        ConversionResult res = ConvertUTF16toUTF8(&SourceStart, SourceEnd, &TargetStart, TargetEnd, strictConversion);

 	        if (res != conversionOK) {

-	            delete [] Utf8StringNative;

+	            delete[] Utf8StringNative;

 	            return (Utf8String)"";

 	        }

 	        *TargetStart = 0;

 	        Utf8String ResultString(Utf8StringNative);

-	        delete [] Utf8StringNative;

+	        delete[] Utf8StringNative;

 	        return ResultString;

 	    } else if (sizeof(wchar_t) == 4) {

 	        size_t Utf8Size = 4 * WideSize + 1;

@@ -133,12 +133,12 @@ Utf8String StringUtil::wideToUtf8(const WideString &WideStr) {
 

 	        ConversionResult res = ConvertUTF32toUTF8(&SourceStart, SourceEnd, &TargetStart, TargetEnd, strictConversion);

 	        if (res != conversionOK) {

-	            delete [] Utf8StringNative;

+	            delete[] Utf8StringNative;

 	            return (Utf8String)"";

 	        }

 	        *TargetStart = 0;

 	        Utf8String ResultString(Utf8StringNative);

-	        delete [] Utf8StringNative;

+	        delete[] Utf8StringNative;

 	        return ResultString;

 	    } else {

 	        return (Utf8String)"";

@@ -179,7 +179,7 @@ WideString StringUtil::ansiToWide(const AnsiString &str) {
 	    wchar_t *wstr = new wchar_t[WideSize];

 	    mbstowcs(wstr, str.c_str(), WideSize);

 	    WideString ResultString(wstr);

-	    delete [] wstr;

+	    delete[] wstr;

 	    return ResultString;*/

 	return WideString(str);

 }

@@ -198,7 +198,7 @@ AnsiString StringUtil::wideToAnsi(const WideString &wstr) {
 	    char *str = new char[WideSize];

 	    wcstombs(str, wstr.c_str(), WideSize);

 	    AnsiString ResultString(str);

-	    delete [] str;

+	    delete[] str;

 	    return ResultString;*/

 	return AnsiString(wstr);

 }

diff --git a/engines/wintermute/video/video_player.cpp b/engines/wintermute/video/video_player.cpp
index be3bb3ec94..ac16104268 100644
--- a/engines/wintermute/video/video_player.cpp
+++ b/engines/wintermute/video/video_player.cpp
@@ -104,9 +104,9 @@ bool VideoPlayer::cleanup() {
 	if (_audioStream) AVIStreamRelease(m_AudioStream);
 	if (_videoStream) AVIStreamRelease(m_VideoStream);
 
-	if (_audioFormat)  delete [](byte *)m_AudioFormat;
-	if (_videoFormat)  delete [](byte *)m_VideoFormat;
-	if (_targetFormat) delete [](byte *)m_TargetFormat;
+	if (_audioFormat)  delete[](byte *)m_AudioFormat;
+	if (_videoFormat)  delete[](byte *)m_VideoFormat;
+	if (_targetFormat) delete[](byte *)m_TargetFormat;
 
 	SAFE_DELETE(_sound);
 	SAFE_DELETE(_vidRenderer);
@@ -437,7 +437,7 @@ bool VideoPlayer::loadSubtitles(const char *filename, const char *SubtitleFile)
 					if (TokenPos == 0) Start = atoi(Token);
 					else if (TokenPos == 1) End = atoi(Token);
 
-					delete [] Token;
+					delete[] Token;
 				} else {
 					Text[TextLength] = line[i];
 					TextLength++;
@@ -456,12 +456,12 @@ bool VideoPlayer::loadSubtitles(const char *filename, const char *SubtitleFile)
 
 		if (Start != -1 && TextLength > 0) _subtitles.add(new CVidSubtitle(_gameRef,  Text, Start, End));
 
-		delete [] Text;
+		delete[] Text;
 
 		Pos += LineLength + 1;
 	}
 
-	delete [] Buffer;
+	delete[] Buffer;
 #endif
 	return STATUS_OK;
 }
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 31c4ee2fb8..d797972e40 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -185,8 +185,8 @@ int WinterMuteEngine::init() {
 				sprintf(param, "./%s", IniName);
 				_game->_registry->SetIniName(param);
 				
-				delete [] IniDir;
-				delete [] IniName;
+				delete[] IniDir;
+				delete[] IniName;
 			}
 		} else if (scumm_stricmp(param, "-windowed") == 0) windowedMode = true;
 	}*/
@@ -270,7 +270,7 @@ int WinterMuteEngine::init() {
 	
 	if (SaveGame) {
 		_game->loadGame(SaveGame);
-		delete [] SaveGame;
+		delete[] SaveGame;
 	}
 	
 	// all set, ready to go