thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

JANITORIAL: Fix whitespace in pointer template arg

Browse source
This commit is contained in:
Tarek Soliman 2012-02-15 00:06:13 -06:00
parent dbcd177606
commit 921f602ab8
61 changed files with 119 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

4
audio/softsynth/mt32/Part.h
View file

@ -37,8 +37,8 @@ private:
unsigned int activePartialCount;
PatchCache patchCache[4];
Common::List<Poly*> freePolys;
Common::List<Poly*> activePolys;
Common::List<Poly *> freePolys;
Common::List<Poly *> activePolys;
void setPatch(const PatchParam *patch);
unsigned int midiKeyToKey(unsigned int midiKey);

8
backends/fs/symbian/symbian-fs.cpp
View file

@ -70,7 +70,7 @@ SymbianFilesystemNode::SymbianFilesystemNode(const Common::String &path) {
TPtrC8 ptr((const unsigned char*)_path.c_str(),_path.size());
fname.Copy(ptr);
if (static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession().Entry(fname, fileAttribs) == KErrNone) {
if (static_cast<OSystem_SDL_Symbian *>(g_system)->FsSession().Entry(fname, fileAttribs) == KErrNone) {
_isValid = true;
_isDirectory = fileAttribs.IsDir();
} else {
@ -87,7 +87,7 @@ bool SymbianFilesystemNode::exists() const {
TFileName fname;
TPtrC8 ptr((const unsigned char*) _path.c_str(), _path.size());
fname.Copy(ptr);
bool fileExists = BaflUtils::FileExists(static_cast<OSystem_SDL_Symbian*> (g_system)->FsSession(), fname);
bool fileExists = BaflUtils::FileExists(static_cast<OSystem_SDL_Symbian *> (g_system)->FsSession(), fname);
if (!fileExists) {
TParsePtrC parser(fname);
if (parser.PathPresent() && parser.Path().Compare(_L("\\")) == KErrNone && !parser.NameOrExtPresent()) {
@ -125,7 +125,7 @@ bool SymbianFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
if (_isPseudoRoot) {
// Drives enumeration
RFs& fs = static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession();
RFs& fs = static_cast<OSystem_SDL_Symbian *>(g_system)->FsSession();
TInt driveNumber;
TChar driveLetter;
TUint driveLetterValue;
@ -170,7 +170,7 @@ bool SymbianFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
if (_path.lastChar() != '\\')
fname.Append('\\');
if (static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession().GetDir(fname, KEntryAttNormal|KEntryAttDir, 0, dirPtr) == KErrNone) {
if (static_cast<OSystem_SDL_Symbian *>(g_system)->FsSession().GetDir(fname, KEntryAttNormal|KEntryAttDir, 0, dirPtr) == KErrNone) {
CleanupStack::PushL(dirPtr);
TInt cnt = dirPtr->Count();
for (TInt loop = 0; loop < cnt; loop++) {

8
backends/fs/symbian/symbianstream.cpp
View file

@ -70,22 +70,22 @@ TSymbianFileEntry* CreateSymbianFileEntry(const char* name, const char* mode) {
switch (mode[0]) {
case 'a':
if (fileEntry->_fileHandle.Open(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
if (fileEntry->_fileHandle.Create(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
if (fileEntry->_fileHandle.Open(static_cast<OSystem_SDL_Symbian *>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
if (fileEntry->_fileHandle.Create(static_cast<OSystem_SDL_Symbian *>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
delete fileEntry;
fileEntry = NULL;
}
}
break;
case 'r':
if (fileEntry->_fileHandle.Open(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
if (fileEntry->_fileHandle.Open(static_cast<OSystem_SDL_Symbian *>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
delete fileEntry;
fileEntry = NULL;
}
break;
case 'w':
if (fileEntry->_fileHandle.Replace(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
if (fileEntry->_fileHandle.Replace(static_cast<OSystem_SDL_Symbian *>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
delete fileEntry;
fileEntry = NULL;
}

12
backends/keymapper/hardware-key.h
View file

@ -103,7 +103,7 @@ public:
HardwareKeySet() { }
virtual ~HardwareKeySet() {
List<const HardwareKey*>::const_iterator it;
List<const HardwareKey *>::const_iterator it;
for (it = _keys.begin(); it != _keys.end(); it++)
delete *it;
@ -115,7 +115,7 @@ public:
}
const HardwareKey *findHardwareKey(const char *id) const {
List<const HardwareKey*>::const_iterator it;
List<const HardwareKey *>::const_iterator it;
for (it = _keys.begin(); it != _keys.end(); it++) {
if (strncmp((*it)->hwKeyId, id, HWKEY_ID_SIZE) == 0)
@ -125,7 +125,7 @@ public:
}
const HardwareKey *findHardwareKey(const KeyState& keystate) const {
List<const HardwareKey*>::const_iterator it;
List<const HardwareKey *>::const_iterator it;
for (it = _keys.begin(); it != _keys.end(); it++) {
if ((*it)->key == keystate)
@ -134,7 +134,7 @@ public:
return 0;
}
const List<const HardwareKey*> &getHardwareKeys() const {
const List<const HardwareKey *> &getHardwareKeys() const {
return _keys;
}
@ -178,7 +178,7 @@ public:
private:
void checkForKey(const HardwareKey *key) {
List<const HardwareKey*>::iterator it;
List<const HardwareKey *>::iterator it;
for (it = _keys.begin(); it != _keys.end(); it++) {
if (strncmp((*it)->hwKeyId, key->hwKeyId, HWKEY_ID_SIZE) == 0)
@ -188,7 +188,7 @@ private:
}
}
List<const HardwareKey*> _keys;
List<const HardwareKey *> _keys;
};
} // End of namespace Common

24
backends/keymapper/keymap.cpp
View file

@ -31,7 +31,7 @@
namespace Common {
Keymap::Keymap(const Keymap& km) : _actions(km._actions), _keymap(), _configDomain(0) {
List<Action*>::iterator it;
List<Action *>::iterator it;
for (it = _actions.begin(); it != _actions.end(); ++it) {
const HardwareKey *hwKey = (*it)->getMappedKey();
@ -43,7 +43,7 @@ Keymap::Keymap(const Keymap& km) : _actions(km._actions), _keymap(), _configDoma
}
Keymap::~Keymap() {
List<Action*>::iterator it;
List<Action *>::iterator it;
for (it = _actions.begin(); it != _actions.end(); ++it)
delete *it;
@ -57,7 +57,7 @@ void Keymap::addAction(Action *action) {
}
void Keymap::registerMapping(Action *action, const HardwareKey *hwKey) {
HashMap<KeyState, Action*>::iterator it;
HashMap<KeyState, Action *>::iterator it;
it = _keymap.find(hwKey->key);
@ -82,7 +82,7 @@ Action *Keymap::getAction(const char *id) {
}
Action *Keymap::findAction(const char *id) {
List<Action*>::iterator it;
List<Action *>::iterator it;
for (it = _actions.begin(); it != _actions.end(); ++it) {
if (strncmp((*it)->id, id, ACTION_ID_SIZE) == 0)
@ -92,7 +92,7 @@ Action *Keymap::findAction(const char *id) {
}
const Action *Keymap::findAction(const char *id) const {
List<Action*>::const_iterator it;
List<Action *>::const_iterator it;
for (it = _actions.begin(); it != _actions.end(); ++it) {
if (strncmp((*it)->id, id, ACTION_ID_SIZE) == 0)
@ -103,7 +103,7 @@ const Action *Keymap::findAction(const char *id) const {
}
Action *Keymap::getMappedAction(const KeyState& ks) const {
HashMap<KeyState, Action*>::iterator it;
HashMap<KeyState, Action *>::iterator it;
it = _keymap.find(ks);
@ -158,7 +158,7 @@ void Keymap::saveMappings() {
if (!_configDomain)
return;
List<Action*>::const_iterator it;
List<Action *>::const_iterator it;
String prefix = KEYMAP_KEY_PREFIX + _name + "_";
for (it = _actions.begin(); it != _actions.end(); ++it) {
@ -179,7 +179,7 @@ void Keymap::saveMappings() {
}
bool Keymap::isComplete(const HardwareKeySet *hwKeys) {
List<Action*>::iterator it;
List<Action *>::iterator it;
bool allMapped = true;
uint numberMapped = 0;
@ -201,11 +201,11 @@ bool Keymap::isComplete(const HardwareKeySet *hwKeys) {
void Keymap::automaticMapping(HardwareKeySet *hwKeys) {
#if 0 //disabling the broken automapper for now
// Create copies of action and key lists.
List<Action*> actions(_actions);
List<const HardwareKey*> keys(hwKeys->getHardwareKeys());
List<Action *> actions(_actions);
List<const HardwareKey *> keys(hwKeys->getHardwareKeys());
List<Action*>::iterator actIt;
List<const HardwareKey*>::iterator keyIt, selectedKey;
List<Action *>::iterator actIt;
List<const HardwareKey *>::iterator keyIt, selectedKey;
// Remove actions and keys from local lists that have already been mapped.
actIt = actions.begin();

6
backends/keymapper/keymap.h
View file

@ -67,7 +67,7 @@ public:
/**
* Get the list of all the Actions contained in this Keymap
*/
List<Action*>& getActions() { return _actions; }
List<Action *>& getActions() { return _actions; }
/**
* Find the Action that a key is mapped to
@ -137,8 +137,8 @@ private:
String _name;
Keymap *_parent;
List<Action*> _actions;
HashMap<KeyState, Action*> _keymap;
List<Action *> _actions;
HashMap<KeyState, Action *> _keymap;
ConfigManager::Domain *_configDomain;
};

2
backends/keymapper/keymapper.cpp
View file

@ -217,7 +217,7 @@ bool Keymapper::mapKey(const KeyState& key, bool keyDown) {
if (action)
_keysDown[key] = action;
} else {
HashMap<KeyState, Action*>::iterator it = _keysDown.find(key);
HashMap<KeyState, Action *>::iterator it = _keysDown.find(key);
if (it != _keysDown.end()) {
action = it->_value;

4
backends/keymapper/keymapper.h
View file

@ -86,7 +86,7 @@ public:
/**
* Get a list of all registered HardwareKeys
*/
const List<const HardwareKey*> &getHardwareKeys() const {
const List<const HardwareKey *> &getHardwareKeys() const {
assert(_hardwareKeys);
return _hardwareKeys->getHardwareKeys();
}
@ -196,7 +196,7 @@ private:
bool _enabled;
Stack<MapRecord> _activeMaps;
HashMap<KeyState, Action*> _keysDown;
HashMap<KeyState, Action *> _keysDown;
};

8
backends/keymapper/remap-dialog.cpp
View file

@ -323,7 +323,7 @@ void RemapDialog::loadKeymap() {
if (!activeKeymaps.empty() && _kmPopUp->getSelected() == 0) {
// load active keymaps
List<const HardwareKey*> freeKeys(_keymapper->getHardwareKeys());
List<const HardwareKey *> freeKeys(_keymapper->getHardwareKeys());
int topIndex = activeKeymaps.size() - 1;
@ -334,7 +334,7 @@ void RemapDialog::loadKeymap() {
// add most active keymap's keys
Keymapper::MapRecord top = activeKeymaps[topIndex];
List<Action*>::iterator actIt;
List<Action *>::iterator actIt;
debug(3, "RemapDialog::loadKeymap top keymap: %s", top.keymap->getName().c_str());
for (actIt = top.keymap->getActions().begin(); actIt != top.keymap->getActions().end(); ++actIt) {
Action *act = *actIt;
@ -351,7 +351,7 @@ void RemapDialog::loadKeymap() {
for (int i = topIndex - 1; i >= 0; --i) {
Keymapper::MapRecord mr = activeKeymaps[i];
debug(3, "RemapDialog::loadKeymap keymap: %s", mr.keymap->getName().c_str());
List<const HardwareKey*>::iterator keyIt = freeKeys.begin();
List<const HardwareKey *>::iterator keyIt = freeKeys.begin();
while (keyIt != freeKeys.end()) {
Action *act = mr.keymap->getMappedAction((*keyIt)->key);
@ -373,7 +373,7 @@ void RemapDialog::loadKeymap() {
} else if (_kmPopUp->getSelected() != -1) {
Keymap *km = _keymapTable[_kmPopUp->getSelectedTag()];
List<Action*>::iterator it;
List<Action *>::iterator it;
for (it = km->getActions().begin(); it != km->getActions().end(); ++it) {
ActionInfo info = {*it, false, (*it)->description};

6
backends/taskbar/win32/win32-taskbar.cpp
View file

@ -74,7 +74,7 @@ Win32TaskbarManager::Win32TaskbarManager() : _taskbar(NULL), _count(0), _icon(NU
0,
CLSCTX_INPROC_SERVER,
IID_ITaskbarList3,
reinterpret_cast<void**> (&(_taskbar)));
reinterpret_cast<void **> (&(_taskbar)));
if (SUCCEEDED(hr)) {
// Initialize taskbar object
@ -274,7 +274,7 @@ void Win32TaskbarManager::addRecent(const Common::String &name, const Common::St
GetModuleFileNameW(NULL, path, MAX_PATH);
// Create a shell link.
if (SUCCEEDED(CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC, IID_IShellLinkW, reinterpret_cast<void**> (&link)))) {
if (SUCCEEDED(CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC, IID_IShellLinkW, reinterpret_cast<void **> (&link)))) {
// Convert game name and description to Unicode.
LPWSTR game = ansiToUnicode(name.c_str());
LPWSTR desc = ansiToUnicode(description.c_str());
@ -296,7 +296,7 @@ void Win32TaskbarManager::addRecent(const Common::String &name, const Common::St
// The link's display name must be set via property store.
IPropertyStore* propStore;
HRESULT hr = link->QueryInterface(IID_IPropertyStore, reinterpret_cast<void**> (&(propStore)));
HRESULT hr = link->QueryInterface(IID_IPropertyStore, reinterpret_cast<void **> (&(propStore)));
if (SUCCEEDED(hr)) {
PROPVARIANT pv;
pv.vt = VT_LPWSTR;

2
common/huffman.h
View file

@ -68,7 +68,7 @@ private:
typedef List<Symbol> CodeList;
typedef Array<CodeList> CodeLists;
typedef Array<Symbol*> SymbolList;
typedef Array<Symbol *> SymbolList;
/** Lists of codes and their symbols, sorted by code length. */
CodeLists _codes;

2
common/list.h
View file

@ -226,7 +226,7 @@ public:
}
const_iterator end() const {
return const_iterator(const_cast<NodeBase*>(&_anchor));
return const_iterator(const_cast<NodeBase *>(&_anchor));
}
protected:

4
common/quicktime.h
View file

@ -155,7 +155,7 @@ protected:
uint16 height;
CodecType codecType;
Array<SampleDesc*> sampleDescs;
Array<SampleDesc *> sampleDescs;
uint32 editCount;
EditListEntry *editList;
@ -180,7 +180,7 @@ protected:
uint32 _duration;
Rational _scaleFactorX;
Rational _scaleFactorY;
Array<Track*> _tracks;
Array<Track *> _tracks;
uint32 _beginOffset;
MacResManager *_resFork;

2
common/xmlparser.cpp
View file

@ -39,7 +39,7 @@ XMLParser::~XMLParser() {
delete _XMLkeys;
delete _stream;
for (List<XMLKeyLayout*>::iterator i = _layoutList.begin();
for (List<XMLKeyLayout *>::iterator i = _layoutList.begin();
i != _layoutList.end(); ++i)
delete *i;

6
common/xmlparser.h
View file

@ -70,7 +70,7 @@ class SeekableReadStream;
ParserCallback callback;\
bool doCallback(XMLParser *parent, ParserNode *node) {return ((kLocalParserName*)parent->*callback)(node);} };\
virtual void buildLayout() { \
Common::Stack<XMLKeyLayout*> layout; \
Common::Stack<XMLKeyLayout *> layout; \
CustomXMLKeyLayout *lay = 0; \
XMLKeyLayout::XMLKeyProperty prop; \
_XMLkeys = new CustomXMLKeyLayout; \
@ -334,7 +334,7 @@ protected:
*/
virtual void cleanup() {}
List<XMLKeyLayout*> _layoutList;
List<XMLKeyLayout *> _layoutList;
private:
char _char;
@ -346,7 +346,7 @@ private:
String _error; /** Current error message */
String _token; /** Current text token */
Stack<ParserNode*> _activeKey; /** Node stack of the parsed keys */
Stack<ParserNode *> _activeKey; /** Node stack of the parsed keys */
};
} // End of namespace Common

2
engines/agi/agi.h
View file

@ -631,7 +631,7 @@ struct AgiGame {
AgiLogic *_curLogic;
// words
Common::Array<AgiWord*> words[26];
Common::Array<AgiWord *> words[26];
// view table
VtEntry viewTable[MAX_VIEWTABLE];

4
engines/agi/menu.h
View file

@ -33,8 +33,8 @@ namespace Agi {
struct AgiMenu;
struct AgiMenuOption;
typedef Common::List<AgiMenu*> MenuList;
typedef Common::List<AgiMenuOption*> MenuOptionList;
typedef Common::List<AgiMenu *> MenuList;
typedef Common::List<AgiMenuOption *> MenuOptionList;
class GfxMgr;
class PictureMgr;

2
engines/agi/sprite.h
View file

@ -27,7 +27,7 @@ namespace Agi {
struct Sprite;
typedef Common::List<Sprite*> SpriteList;
typedef Common::List<Sprite *> SpriteList;
class AgiEngine;
class GfxMgr;

2
engines/agi/words.cpp
View file

@ -130,7 +130,7 @@ int AgiEngine::findWord(const char *word, int *flen) {
return -1;
*flen = 0;
Common::Array<AgiWord*> &a = _game.words[c];
Common::Array<AgiWord *> &a = _game.words[c];
for (int i = 0; i < (int)a.size(); i++) {
int wlen = strlen(a[i]->word);

2
engines/cruise/cruise.h
View file

@ -116,7 +116,7 @@ public:
static uint32 const cookie = 0x41424344;
};
Common::List<MemInfo*> _memList;
Common::List<MemInfo *> _memList;
typedef Common::List<Common::Rect> RectList;

2
engines/cruise/cruise_main.cpp
View file

@ -45,7 +45,7 @@ typedef CruiseEngine::MemInfo MemInfo;
void MemoryList() {
if (!_vm->_memList.empty()) {
debug("Current list of un-freed memory blocks:");
Common::List<MemInfo*>::iterator i;
Common::List<MemInfo *>::iterator i;
for (i = _vm->_memList.begin(); i != _vm->_memList.end(); ++i) {
MemInfo const *const v = *i;
debug("%s - %d", v->fname, v->lineNum);

2
engines/draci/sprite.cpp
View file

@ -318,7 +318,7 @@ void Text::repeatedlySplitLongLines(uint maxWidth) {
}
void Text::splitLinesLongerThan(uint maxWidth) {
char *start = const_cast<char*> (_text.c_str()); // hacky
char *start = const_cast<char *> (_text.c_str()); // hacky
while (1) {
char *end = strchr(start, '|');
if (end) {

2
engines/kyra/eobcommon.h
View file

@ -623,7 +623,7 @@ protected:
uint32 _envAudioTimer;
uint16 _teleporterPulse;
Common::Array<const int16*> _dscWallMapping;
Common::Array<const int16 *> _dscWallMapping;
const int16 *_dscShapeCoords;
const uint8 *_dscItemPosIndex;

2
engines/kyra/kyra_hof.cpp
View file

@ -171,7 +171,7 @@ KyraEngine_HoF::~KyraEngine_HoF() {
delete[] _conversationState[i];
delete[] _conversationState;
for (Common::Array<const TIMOpcode*>::iterator i = _timOpcodes.begin(); i != _timOpcodes.end(); ++i)
for (Common::Array<const TIMOpcode *>::iterator i = _timOpcodes.begin(); i != _timOpcodes.end(); ++i)
delete *i;
_timOpcodes.clear();
}

2
engines/kyra/kyra_hof.h
View file

@ -656,7 +656,7 @@ protected:
int t2_resetChat(const TIM *tim, const uint16 *param);
int t2_playSoundEffect(const TIM *tim, const uint16 *param);
Common::Array<const TIMOpcode*> _timOpcodes;
Common::Array<const TIMOpcode *> _timOpcodes;
// sound
int _oldTalkFile;

2
engines/kyra/kyra_mr.cpp
View file

@ -183,7 +183,7 @@ KyraEngine_MR::~KyraEngine_MR() {
delete[] _sceneStrings;
delete[] _talkObjectList;
for (Common::Array<const Opcode*>::iterator i = _opcodesDialog.begin(); i != _opcodesDialog.end(); ++i)
for (Common::Array<const Opcode *>::iterator i = _opcodesDialog.begin(); i != _opcodesDialog.end(); ++i)
delete *i;
_opcodesDialog.clear();

2
engines/kyra/kyra_mr.h
View file

@ -463,7 +463,7 @@ private:
void npcChatSequence(const char *str, int object, int vocHigh, int vocLow);
Common::Array<const Opcode*> _opcodesDialog;
Common::Array<const Opcode *> _opcodesDialog;
int o3d_updateAnim(EMCState *script);
int o3d_delay(EMCState *script);

2
engines/kyra/kyra_v1.h
View file

@ -326,7 +326,7 @@ protected:
// opcode
virtual void setupOpcodeTable() = 0;
Common::Array<const Opcode*> _opcodes;
Common::Array<const Opcode *> _opcodes;
int o1_queryGameFlag(EMCState *script);
int o1_setGameFlag(EMCState *script);

4
engines/kyra/kyra_v2.h
View file

@ -224,7 +224,7 @@ protected:
// Sequences
EMCData _animationScriptData;
EMCState _animationScriptState;
Common::Array<const Opcode*> _opcodesAnimation;
Common::Array<const Opcode *> _opcodesAnimation;
void runAnimationScript(const char *filename, int allowSkip, int resetChar, int newShapes, int shapeUnload);
@ -252,7 +252,7 @@ protected:
virtual void uninitAnimationShapes(int count, uint8 *filedata) = 0;
// Shapes
typedef Common::HashMap<int, uint8*> ShapeMap;
typedef Common::HashMap<int, uint8 *> ShapeMap;
ShapeMap _gameShapes;
uint8 *getShapePtr(int index) const;

10
engines/kyra/lol.h
View file

@ -447,7 +447,7 @@ private:
uint16 _envSfxQueuedBlocks[10];
int _nextSpeechId;
int _nextSpeaker;
typedef Common::List<Audio::SeekableAudioStream*> SpeechList;
typedef Common::List<Audio::SeekableAudioStream *> SpeechList;
SpeechList _speechList;
int _curTlkFile;
@ -762,14 +762,14 @@ private:
// tim opcode
void setupOpcodeTable();
Common::Array<const TIMOpcode*> _timIntroOpcodes;
Common::Array<const TIMOpcode *> _timIntroOpcodes;
int tlol_setupPaletteFade(const TIM *tim, const uint16 *param);
int tlol_loadPalette(const TIM *tim, const uint16 *param);
int tlol_setupPaletteFadeEx(const TIM *tim, const uint16 *param);
int tlol_processWsaFrame(const TIM *tim, const uint16 *param);
int tlol_displayText(const TIM *tim, const uint16 *param);
Common::Array<const TIMOpcode*> _timOutroOpcodes;
Common::Array<const TIMOpcode *> _timOutroOpcodes;
int tlol_fadeInScene(const TIM *tim, const uint16 *param);
int tlol_unusedResourceFunc(const TIM *tim, const uint16 *param);
int tlol_fadeInPalette(const TIM *tim, const uint16 *param);
@ -778,7 +778,7 @@ private:
int tlol_delayForChat(const TIM *tim, const uint16 *param);
int tlol_fadeOutSound(const TIM *tim, const uint16 *param);
Common::Array<const TIMOpcode*> _timIngameOpcodes;
Common::Array<const TIMOpcode *> _timIngameOpcodes;
int tlol_initSceneWindowDialogue(const TIM *tim, const uint16 *param);
int tlol_restoreAfterSceneWindowDialogue(const TIM *tim, const uint16 *param);
int tlol_giveItem(const TIM *tim, const uint16 *param);
@ -1156,7 +1156,7 @@ private:
// spells
typedef Common::Functor1Mem<ActiveSpell *, int, LoLEngine> SpellProc;
Common::Array<const SpellProc*> _spellProcs;
Common::Array<const SpellProc *> _spellProcs;
typedef void (LoLEngine::*SpellProcCallback)(WSAMovie_v2 *, int, int);
int castSpell(int charNum, int spellType, int spellLevel);

2
engines/kyra/screen.h
View file

@ -554,7 +554,7 @@ protected:
uint8 _sjisInvisibleColor;
Palette *_screenPalette;
Common::Array<Palette*> _palettes;
Common::Array<Palette *> _palettes;
Palette *_internFadePalette;
Font *_fonts[FID_NUM];

2
engines/kyra/script.cpp
View file

@ -95,7 +95,7 @@ bool EMCInterpreter::callback(Common::IFFChunk &chunk) {
return false;
}
bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array<const Opcode*> *opcodes) {
bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array<const Opcode *> *opcodes) {
Common::SeekableReadStream *stream = _vm->resource()->createReadStream(filename);
if (!stream) {
error("Couldn't open script file '%s'", filename);

4
engines/kyra/script.h
View file

@ -41,7 +41,7 @@ struct EMCData {
uint16 *ordr;
uint16 dataSize;
const Common::Array<const Opcode*> *sysFuncs;
const Common::Array<const Opcode *> *sysFuncs;
};
struct EMCState {
@ -109,7 +109,7 @@ class EMCInterpreter {
public:
EMCInterpreter(KyraEngine_v1 *vm);
bool load(const char *filename, EMCData *data, const Common::Array<const Opcode*> *opcodes);
bool load(const char *filename, EMCData *data, const Common::Array<const Opcode *> *opcodes);
void unload(EMCData *data);
void init(EMCState *scriptState, const EMCData *data);

2
engines/kyra/script_eob.h
View file

@ -99,7 +99,7 @@ private:
InfProc *proc;
Common::String desc;
};
Common::Array<const InfOpcode*> _opcodes;
Common::Array<const InfOpcode *> _opcodes;
int8 *_scriptData;
uint16 _scriptSize;

2
engines/kyra/script_hof.cpp
View file

@ -1480,7 +1480,7 @@ typedef Common::Functor2Mem<const TIM *, const uint16 *, int, KyraEngine_HoF> TI
#define OpcodeTimUnImpl() _timOpcodes.push_back(new TIMOpcodeV2(this, 0))
void KyraEngine_HoF::setupOpcodeTable() {
Common::Array<const Opcode*> *table = 0;
Common::Array<const Opcode *> *table = 0;
_opcodes.reserve(176);
SetOpcodeTable(_opcodes);

2
engines/kyra/script_mr.cpp
View file

@ -1129,7 +1129,7 @@ typedef Common::Functor1Mem<EMCState *, int, KyraEngine_MR> OpcodeV3;
#define Opcode(x) table->push_back(new OpcodeV3(this, &KyraEngine_MR::x))
#define OpcodeUnImpl() table->push_back(new OpcodeV3(this, 0))
void KyraEngine_MR::setupOpcodeTable() {
Common::Array<const Opcode*> *table = 0;
Common::Array<const Opcode *> *table = 0;
_opcodes.reserve(176);
SetOpcodeTable(_opcodes);

2
engines/kyra/script_tim.cpp
View file

@ -135,7 +135,7 @@ bool TIMInterpreter::callback(Common::IFFChunk &chunk) {
return false;
}
TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpcode*> *opcodes) {
TIM *TIMInterpreter::load(const char *filename, const Common::Array<const TIMOpcode *> *opcodes) {
if (!_vm->resource()->exists(filename))
return 0;

4
engines/kyra/script_tim.h
View file

@ -146,7 +146,7 @@ struct TIM {
uint16 *avtl;
uint8 *text;
const Common::Array<const TIMOpcode*> *opcodes;
const Common::Array<const TIMOpcode *> *opcodes;
// TODO: Get rid of this ugly HACK to allow the
// Lands of Lore outro to be working properly.
@ -159,7 +159,7 @@ public:
TIMInterpreter(KyraEngine_v1 *engine, Screen_v2 *screen_v2, OSystem *system);
virtual ~TIMInterpreter();
TIM *load(const char *filename, const Common::Array<const TIMOpcode*> *opcodes);
TIM *load(const char *filename, const Common::Array<const TIMOpcode *> *opcodes);
void unload(TIM *&tim) const;
bool callback(Common::IFFChunk &chunk);

4
engines/made/database.h
View file

@ -151,9 +151,9 @@ public:
void dumpObject(int16 index);
protected:
typedef Common::HashMap<uint32, int16*> ObjectPropertyCacheMap;
typedef Common::HashMap<uint32, int16 *> ObjectPropertyCacheMap;
MadeEngine *_vm;
Common::Array<Object*> _objects;
Common::Array<Object *> _objects;
ObjectPropertyCacheMap _objectPropertyCache;
byte *_gameState;
uint32 _gameStateSize;

4
engines/made/resource.h
View file

@ -111,7 +111,7 @@ public:
int16 getWidth() const { return _width; }
int16 getHeight() const { return _height; }
protected:
Common::Array<Graphics::Surface*> _frames;
Common::Array<Graphics::Surface *> _frames;
uint16 _flags;
int16 _width, _height;
};
@ -210,7 +210,7 @@ protected:
bool _isV1;
typedef Common::Array<ResourceSlot> ResourceSlots;
typedef Common::HashMap<uint32, ResourceSlots*> ResMap;
typedef Common::HashMap<uint32, ResourceSlots *> ResMap;
void openResourceBlock(const char *filename, Common::File *blockFile, uint32 resType);
ResMap _resSlots;

2
engines/made/scriptfuncs.h
View file

@ -68,7 +68,7 @@ protected:
Audio::SoundHandle _pcSpeakerHandle1, _pcSpeakerHandle2;
Audio::PCSpeaker *_pcSpeaker1, *_pcSpeaker2;
Common::Array<const ExternalFunc*> _externalFuncs;
Common::Array<const ExternalFunc *> _externalFuncs;
Common::Array<const char *> _externalFuncNames;
GenericResource *_musicRes;

4
engines/mohawk/graphics.cpp
View file

@ -108,9 +108,9 @@ GraphicsManager::~GraphicsManager() {
}
void GraphicsManager::clearCache() {
for (Common::HashMap<uint16, MohawkSurface*>::iterator it = _cache.begin(); it != _cache.end(); it++)
for (Common::HashMap<uint16, MohawkSurface *>::iterator it = _cache.begin(); it != _cache.end(); it++)
delete it->_value;
for (Common::HashMap<uint16, Common::Array<MohawkSurface*> >::iterator it = _subImageCache.begin(); it != _subImageCache.end(); it++) {
for (Common::HashMap<uint16, Common::Array<MohawkSurface *> >::iterator it = _subImageCache.begin(); it != _subImageCache.end(); it++) {
Common::Array<MohawkSurface *> &array = it->_value;
for (uint i = 0; i < array.size(); i++)
delete array[i];

6
engines/mohawk/graphics.h
View file

@ -99,8 +99,8 @@ protected:
private:
// An image cache that stores images until clearCache() is called
Common::HashMap<uint16, MohawkSurface*> _cache;
Common::HashMap<uint16, Common::Array<MohawkSurface*> > _subImageCache;
Common::HashMap<uint16, MohawkSurface *> _cache;
Common::HashMap<uint16, Common::Array<MohawkSurface *> > _subImageCache;
};
#ifdef ENABLE_MYST
@ -222,7 +222,7 @@ private:
uint16 frameCount;
Common::Rect rect;
uint16 speed;
Common::Array<Common::SeekableReadStream*> frameScripts;
Common::Array<Common::SeekableReadStream *> frameScripts;
// Cur frame
uint16 curFrame;

2
engines/mohawk/myst.h
View file

@ -173,7 +173,7 @@ public:
MystGraphics *_gfx;
MystGameState *_gameState;
MystScriptParser *_scriptParser;
Common::Array<MystResource*> _resources;
Common::Array<MystResource *> _resources;
MystResource *_dragResource;
Common::RandomSource *_rnd;

2
engines/mohawk/myst_areas.h
View file

@ -137,7 +137,7 @@ public:
protected:
uint16 _var7;
uint16 _numSubResources;
Common::Array<MystResource*> _subResources;
Common::Array<MystResource *> _subResources;
};
class MystResourceType8 : public MystResourceType7 {

2
engines/mohawk/myst_scripts.h
View file

@ -143,7 +143,7 @@ protected:
const char *desc;
};
Common::Array<MystOpcode*> _opcodes;
Common::Array<MystOpcode *> _opcodes;
MystResource *_invokingResource;

2
engines/mohawk/riven_external.h
View file

@ -53,7 +53,7 @@ private:
ExternalCmd proc;
};
Common::Array<RivenExternalCmd*> _externalCommands;
Common::Array<RivenExternalCmd *> _externalCommands;
void setupCommands();
// Supplementary Functions

2
engines/mohawk/riven_scripts.h
View file

@ -125,7 +125,7 @@ private:
DECLARE_OPCODE(activateMLST);
};
typedef Common::Array<RivenScript*> RivenScriptList;
typedef Common::Array<RivenScript *> RivenScriptList;
class RivenScriptManager {
public:

6
engines/parallaction/debug.cpp
View file

@ -69,14 +69,14 @@ bool Debugger::Cmd_Location(int argc, const char **argv) {
switch (argc) {
case 3:
character = const_cast<char*>(argv[2]);
location = const_cast<char*>(argv[1]);
character = const_cast<char *>(argv[2]);
location = const_cast<char *>(argv[1]);
sprintf(tmp, "%s.%s", location, character);
_vm->scheduleLocationSwitch(tmp);
break;
case 2:
location = const_cast<char*>(argv[1]);
location = const_cast<char *>(argv[1]);
_vm->scheduleLocationSwitch(location);
break;

4
engines/parallaction/exec.h
View file

@ -55,7 +55,7 @@ struct CommandContext {
// in Parallaction_XX
};
typedef Common::Functor1<CommandContext&, void> CommandOpcode;
typedef Common::Array<const CommandOpcode*> CommandOpcodeSet;
typedef Common::Array<const CommandOpcode *> CommandOpcodeSet;
#define DECLARE_UNQUALIFIED_COMMAND_OPCODE(op) void cmdOp_##op(CommandContext &)
struct ProgramContext {
@ -67,7 +67,7 @@ struct ProgramContext {
bool _suspend;
};
typedef Common::Functor1<ProgramContext&, void> ProgramOpcode;
typedef Common::Array<const ProgramOpcode*> ProgramOpcodeSet;
typedef Common::Array<const ProgramOpcode *> ProgramOpcodeSet;
#define DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(op) void instOp_##op(ProgramContext &)

6
engines/parallaction/graphics.h
View file

@ -341,12 +341,12 @@ public:
*/
struct BackgroundInfo {
protected:
typedef Common::Array<MaskBuffer*> MaskPatches;
typedef Common::Array<MaskBuffer *> MaskPatches;
MaskPatches _maskPatches;
MaskBuffer _maskBackup;
void clearMaskData();
typedef Common::Array<PathBuffer*> PathPatches;
typedef Common::Array<PathBuffer *> PathPatches;
PathPatches _pathPatches;
PathBuffer _pathBackup;
void clearPathData();
@ -415,7 +415,7 @@ public:
};
typedef Common::Array<GfxObj*> GfxObjArray;
typedef Common::Array<GfxObj *> GfxObjArray;
#define SCENE_DRAWLIST_SIZE 100
class Gfx {

2
engines/parallaction/gui.h
View file

@ -36,7 +36,7 @@ namespace Parallaction {
class MenuInputState;
class MenuInputHelper {
typedef Common::HashMap<Common::String, MenuInputState*> StateMap;
typedef Common::HashMap<Common::String, MenuInputState *> StateMap;
StateMap _map;
MenuInputState *_state;

2
engines/parallaction/objects.cpp
View file

@ -390,7 +390,7 @@ Table::Table(uint32 size) : _size(size), _used(0), _disposeMemory(true) {
}
Table::Table(uint32 size, const char **data) : _size(size), _used(size), _disposeMemory(false) {
_data = const_cast<char**>(data);
_data = const_cast<char **>(data);
}
Table::~Table() {

10
engines/parallaction/parser.h
View file

@ -57,7 +57,7 @@ public:
typedef Common::Functor0<void> Opcode;
typedef Common::Array<const Opcode*> OpcodeSet;
typedef Common::Array<const Opcode *> OpcodeSet;
@ -69,8 +69,8 @@ public:
uint _lookup;
Common::Stack<OpcodeSet*> _opcodes;
Common::Stack<Table*> _statements;
Common::Stack<OpcodeSet *> _opcodes;
Common::Stack<Table *> _statements;
OpcodeSet *_currentOpcodes;
Table *_currentStatements;
@ -199,7 +199,7 @@ protected:
void addCommand();
void clearSet(OpcodeSet &opcodes) {
for (Common::Array<const Opcode*>::iterator i = opcodes.begin(); i != opcodes.end(); ++i)
for (Common::Array<const Opcode *>::iterator i = opcodes.begin(); i != opcodes.end(); ++i)
delete *i;
opcodes.clear();
}
@ -357,7 +357,7 @@ protected:
virtual void parseRValue(ScriptVar &var, const char *str);
void clearSet(OpcodeSet &opcodes) {
for (Common::Array<const Opcode*>::iterator i = opcodes.begin(); i != opcodes.end(); ++i)
for (Common::Array<const Opcode *>::iterator i = opcodes.begin(); i != opcodes.end(); ++i)
delete *i;
opcodes.clear();
}

4
engines/parallaction/parser_br.cpp
View file

@ -1131,7 +1131,7 @@ void LocationParser_br::init() {
_locationZoneStmt = new Table(ARRAYSIZE(_locationZoneStmtRes_br), _locationZoneStmtRes_br);
_locationAnimStmt = new Table(ARRAYSIZE(_locationAnimStmtRes_br), _locationAnimStmtRes_br);
Common::Array<const Opcode*> *table = 0;
Common::Array<const Opcode *> *table = 0;
SetOpcodeTable(_commandParsers);
WARNING_PARSER(unexpected);
@ -1234,7 +1234,7 @@ void ProgramParser_br::init() {
_instructionNames = new Table(ARRAYSIZE(_instructionNamesRes_br), _instructionNamesRes_br);
Common::Array<const Opcode*> *table = 0;
Common::Array<const Opcode *> *table = 0;
SetOpcodeTable(_instructionParsers);
INSTRUCTION_PARSER(defLocal); // invalid opcode -> local definition

4
engines/parallaction/parser_ns.cpp
View file

@ -1107,7 +1107,7 @@ void LocationParser_ns::init() {
_locationZoneStmt = new Table(ARRAYSIZE(_locationZoneStmtRes_ns), _locationZoneStmtRes_ns);
_locationAnimStmt = new Table(ARRAYSIZE(_locationAnimStmtRes_ns), _locationAnimStmtRes_ns);
Common::Array<const Opcode*> *table = 0;
Common::Array<const Opcode *> *table = 0;
SetOpcodeTable(_commandParsers);
WARNING_PARSER(unexpected);
@ -1177,7 +1177,7 @@ void ProgramParser_ns::init() {
_instructionNames = new Table(ARRAYSIZE(_instructionNamesRes_ns), _instructionNamesRes_ns);
Common::Array<const Opcode*> *table = 0;
Common::Array<const Opcode *> *table = 0;
SetOpcodeTable(_instructionParsers);
INSTRUCTION_PARSER(defLocal); // invalid opcode -> local definition
INSTRUCTION_PARSER(animation); // on

2
engines/parallaction/sound_ns.cpp
View file

@ -165,7 +165,7 @@ void DosSoundMan_ns::playCharacterMusic(const char *character) {
return;
}
char *name = const_cast<char*>(character);
char *name = const_cast<char *>(character);
const char *newMusicFile = 0;
if (!scumm_stricmp(name, _dinoName)) {

2
engines/saga/resource.h
View file

@ -157,7 +157,7 @@ protected:
virtual void processPatches(Resource *resource, const GamePatchDescription *patchFiles) { }
};
typedef Common::List<ResourceContext*> ResourceContextList;
typedef Common::List<ResourceContext *> ResourceContextList;
struct MetaResource {
int16 sceneIndex;

2
engines/tinsel/detection.cpp
View file

@ -169,7 +169,7 @@ struct SizeMD5 {
};
typedef Common::HashMap<Common::String, SizeMD5, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> SizeMD5Map;
typedef Common::HashMap<Common::String, Common::FSNode, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FileMap;
typedef Common::Array<const ADGameDescription*> ADGameDescList;
typedef Common::Array<const ADGameDescription *> ADGameDescList;
/**
* Fallback detection scans the list of Discworld 2 targets to see if it can detect an installation

2
engines/toltecs/resource.h
View file

@ -71,7 +71,7 @@ public:
void purgeCache();
protected:
typedef Common::HashMap<uint, Resource*> ResourceMap;
typedef Common::HashMap<uint, Resource *> ResourceMap;
ToltecsEngine *_vm;

2
engines/toltecs/script.h
View file

@ -77,7 +77,7 @@ protected:
};
ToltecsEngine *_vm;
Common::Array<const ScriptFunction*> _scriptFuncs;
Common::Array<const ScriptFunction *> _scriptFuncs;
Common::Array<const char *> _scriptFuncNames;
byte *_stack;