[Scummvm-cvs-logs] SF.net SVN: scummvm:[54001] scummvm/trunk/engines
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Nov 1 17:00:17 CET 2010
Revision: 54001
http://scummvm.svn.sourceforge.net/scummvm/?rev=54001&view=rev
Author: fingolfin
Date: 2010-11-01 16:00:17 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
ENGINES: Remove some 'using' statements
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/menus.cpp
scummvm/trunk/engines/agos/res.cpp
scummvm/trunk/engines/agos/res_snd.cpp
scummvm/trunk/engines/agos/rooms.cpp
scummvm/trunk/engines/agos/sound.cpp
scummvm/trunk/engines/agos/string.cpp
scummvm/trunk/engines/agos/subroutine.cpp
scummvm/trunk/engines/dialogs.cpp
scummvm/trunk/engines/lure/res.cpp
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/engines/scumm/file.cpp
scummvm/trunk/engines/scumm/file_nes.cpp
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/agos/agos.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -43,8 +43,6 @@
#include "sound/mods/protracker.h"
#include "sound/audiocd.h"
-using Common::File;
-
namespace AGOS {
static const GameSpecificSettings simon1_settings = {
Modified: scummvm/trunk/engines/agos/menus.cpp
===================================================================
--- scummvm/trunk/engines/agos/menus.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/agos/menus.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -33,8 +33,6 @@
#include "agos/agos.h"
#include "agos/intern.h"
-using Common::File;
-
namespace AGOS {
void AGOSEngine::loadMenuFile() {
Modified: scummvm/trunk/engines/agos/res.cpp
===================================================================
--- scummvm/trunk/engines/agos/res.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/agos/res.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -35,8 +35,6 @@
#include "common/zlib.h"
-using Common::File;
-
namespace AGOS {
#ifdef ENABLE_AGOS2
@@ -67,7 +65,7 @@
void AGOSEngine::decompressData(const char *srcName, byte *dst, uint32 offset, uint32 srcSize, uint32 dstSize) {
#ifdef USE_ZLIB
- File in;
+ Common::File in;
in.open(srcName);
if (in.isOpen() == false)
error("decompressData: Can't load %s", srcName);
@@ -548,7 +546,7 @@
}
void AGOSEngine::openGameFile() {
- _gameFile = new File();
+ _gameFile = new Common::File();
_gameFile->open(getFileName(GAME_GMEFILE));
if (!_gameFile->isOpen())
@@ -783,7 +781,7 @@
uint32 offs, size;
if (getFeatures() & GF_OLD_BUNDLE) {
- File in;
+ Common::File in;
char filename[15];
if (id == 23)
id = 112;
@@ -824,7 +822,7 @@
}
void AGOSEngine::loadVGAVideoFile(uint16 id, uint8 type, bool useError) {
- File in;
+ Common::File in;
char filename[15];
byte *dst;
uint32 file, offs, srcSize, dstSize;
Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/agos/res_snd.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -35,8 +35,6 @@
#include "sound/mididrv.h"
#include "sound/mods/protracker.h"
-using Common::File;
-
namespace AGOS {
void AGOSEngine_Simon1::playSpeech(uint16 speech_id, uint16 vgaSpriteId) {
@@ -175,7 +173,7 @@
void AGOSEngine::playModule(uint16 music) {
char filename[15];
- File f;
+ Common::File f;
uint32 offs = 0;
if (getPlatform() == Common::kPlatformAmiga && getGameType() == GType_WW) {
@@ -262,7 +260,7 @@
// TODO: Add support for Desktop Tracker format in Acorn disk version
} else {
char filename[15];
- File f;
+ Common::File f;
sprintf(filename, "MOD%d.MUS", music);
f.open(filename);
if (f.isOpen() == false)
@@ -291,7 +289,7 @@
_midi.setLoop(true); // Must do this BEFORE loading music.
char filename[15];
- File f;
+ Common::File f;
sprintf(filename, "MOD%d.MUS", music);
f.open(filename);
if (f.isOpen() == false)
@@ -316,7 +314,7 @@
char filename[15];
- File mus_file;
+ Common::File mus_file;
uint16 mus_offset;
sprintf(filename, "STINGS%i.MUS", _soundFileId);
@@ -347,7 +345,7 @@
};
bool AGOSEngine::loadVGASoundFile(uint16 id, uint8 type) {
- File in;
+ Common::File in;
char filename[15];
byte *dst;
uint32 srcSize, dstSize;
@@ -452,7 +450,7 @@
void AGOSEngine::loadSoundFile(const char* filename) {
- File in;
+ Common::File in;
in.open(filename);
if (in.isOpen() == false)
@@ -471,7 +469,7 @@
byte *dst;
if (getGameId() == GID_DIMP) {
- File in;
+ Common::File in;
char filename[15];
assert(sound >= 1 && sound <= 32);
Modified: scummvm/trunk/engines/agos/rooms.cpp
===================================================================
--- scummvm/trunk/engines/agos/rooms.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/agos/rooms.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -30,24 +30,22 @@
#include "agos/agos.h"
#include "agos/intern.h"
-using Common::File;
-
namespace AGOS {
uint16 AGOSEngine::getBackExit(int n) {
switch (n) {
- case 0:
- return 2;
- case 1:
- return 3;
- case 2:
- return 0;
- case 3:
- return 1;
- case 4:
- return 5;
- case 5:
- return 4;
+ case 0:
+ return 2;
+ case 1:
+ return 3;
+ case 2:
+ return 0;
+ case 3:
+ return 1;
+ case 4:
+ return 5;
+ case 5:
+ return 4;
}
return 0;
@@ -205,13 +203,13 @@
if (n == 1) {
sr = (SubSuperRoom *)findChildOfType(p, kSuperRoomType);
switch (x) {
- case 0: a = -(sr->roomX); break;
- case 1: a = 1; break;
- case 2: a = sr->roomX; break;
- case 3: a = 0xFFFF; break;
- case 4: a = -(sr->roomX * sr->roomY); break;
- case 5: a = (sr->roomX * sr->roomY); break;
- default: return;
+ case 0: a = -(sr->roomX); break;
+ case 1: a = 1; break;
+ case 2: a = sr->roomX; break;
+ case 3: a = 0xFFFF; break;
+ case 4: a = -(sr->roomX * sr->roomY); break;
+ case 5: a = (sr->roomX * sr->roomY); break;
+ default: return;
}
_superRoomNumber += a;
}
@@ -366,7 +364,7 @@
byte *p;
uint i, minNum, maxNum;
char filename[30];
- File in;
+ Common::File in;
Item *item, *itemTmp;
if (_roomsList == NULL)
Modified: scummvm/trunk/engines/agos/sound.cpp
===================================================================
--- scummvm/trunk/engines/agos/sound.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/agos/sound.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -38,23 +38,21 @@
#include "sound/decoders/vorbis.h"
#include "sound/decoders/wave.h"
-using Common::File;
-
namespace AGOS {
#define SOUND_BIG_ENDIAN true
class BaseSound : Common::NonCopyable {
protected:
- File *_file;
+ Common::File *_file;
uint32 *_offsets;
Audio::Mixer *_mixer;
bool _freeOffsets;
DisposeAfterUse::Flag _disposeFile;
public:
- BaseSound(Audio::Mixer *mixer, File *file, uint32 base, bool bigEndian, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES);
- BaseSound(Audio::Mixer *mixer, File *file, uint32 *offsets, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES);
+ BaseSound(Audio::Mixer *mixer, Common::File *file, uint32 base, bool bigEndian, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES);
+ BaseSound(Audio::Mixer *mixer, Common::File *file, uint32 *offsets, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES);
virtual ~BaseSound();
void playSound(uint sound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0) {
@@ -64,7 +62,7 @@
virtual Audio::AudioStream *makeAudioStream(uint sound) = 0;
};
-BaseSound::BaseSound(Audio::Mixer *mixer, File *file, uint32 base, bool bigEndian, DisposeAfterUse::Flag disposeFileAfterUse)
+BaseSound::BaseSound(Audio::Mixer *mixer, Common::File *file, uint32 base, bool bigEndian, DisposeAfterUse::Flag disposeFileAfterUse)
: _mixer(mixer), _file(file), _disposeFile(disposeFileAfterUse) {
uint res = 0;
@@ -98,7 +96,7 @@
_offsets[res] = _file->size();
}
-BaseSound::BaseSound(Audio::Mixer *mixer, File *file, uint32 *offsets, DisposeAfterUse::Flag disposeFileAfterUse)
+BaseSound::BaseSound(Audio::Mixer *mixer, Common::File *file, uint32 *offsets, DisposeAfterUse::Flag disposeFileAfterUse)
: _mixer(mixer), _file(file), _disposeFile(disposeFileAfterUse) {
_offsets = offsets;
@@ -225,9 +223,9 @@
class WavSound : public BaseSound {
public:
- WavSound(Audio::Mixer *mixer, File *file, uint32 base = 0, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES)
+ WavSound(Audio::Mixer *mixer, Common::File *file, uint32 base = 0, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES)
: BaseSound(mixer, file, base, false, disposeFileAfterUse) {}
- WavSound(Audio::Mixer *mixer, File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {}
+ WavSound(Audio::Mixer *mixer, Common::File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {}
Audio::AudioStream *makeAudioStream(uint sound);
void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0);
};
@@ -251,7 +249,7 @@
class VocSound : public BaseSound {
const byte _flags;
public:
- VocSound(Audio::Mixer *mixer, File *file, bool isUnsigned, uint32 base = 0, bool bigEndian = false, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES)
+ VocSound(Audio::Mixer *mixer, Common::File *file, bool isUnsigned, uint32 base = 0, bool bigEndian = false, DisposeAfterUse::Flag disposeFileAfterUse = DisposeAfterUse::YES)
: BaseSound(mixer, file, base, bigEndian, disposeFileAfterUse), _flags(isUnsigned ? Audio::FLAG_UNSIGNED : 0) {}
Audio::AudioStream *makeAudioStream(uint sound);
void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0);
@@ -275,7 +273,7 @@
class RawSound : public BaseSound {
const byte _flags;
public:
- RawSound(Audio::Mixer *mixer, File *file, bool isUnsigned)
+ RawSound(Audio::Mixer *mixer, Common::File *file, bool isUnsigned)
: BaseSound(mixer, file, 0, SOUND_BIG_ENDIAN), _flags(isUnsigned ? Audio::FLAG_UNSIGNED : 0) {}
Audio::AudioStream *makeAudioStream(uint sound);
void playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol = 0);
@@ -305,7 +303,7 @@
class CompressedSound : public BaseSound {
public:
- CompressedSound(Audio::Mixer *mixer, File *file, uint32 base) : BaseSound(mixer, file, base, false) {}
+ CompressedSound(Audio::Mixer *mixer, Common::File *file, uint32 base) : BaseSound(mixer, file, base, false) {}
Common::MemoryReadStream *loadStream(uint sound) const {
if (_offsets == NULL)
@@ -334,7 +332,7 @@
#ifdef USE_MAD
class MP3Sound : public CompressedSound {
public:
- MP3Sound(Audio::Mixer *mixer, File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
+ MP3Sound(Audio::Mixer *mixer, Common::File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
Audio::AudioStream *makeAudioStream(uint sound) {
Common::MemoryReadStream *tmp = loadStream(sound);
if (!tmp)
@@ -350,7 +348,7 @@
#ifdef USE_VORBIS
class VorbisSound : public CompressedSound {
public:
- VorbisSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
+ VorbisSound(Audio::Mixer *mixer, Common::File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
Audio::AudioStream *makeAudioStream(uint sound) {
Common::MemoryReadStream *tmp = loadStream(sound);
if (!tmp)
@@ -366,7 +364,7 @@
#ifdef USE_FLAC
class FLACSound : public CompressedSound {
public:
- FLACSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
+ FLACSound(Audio::Mixer *mixer, Common::File *file, uint32 base = 0) : CompressedSound(mixer, file, base) {}
Audio::AudioStream *makeAudioStream(uint sound) {
Common::MemoryReadStream *tmp = loadStream(sound);
if (!tmp)
@@ -379,7 +377,7 @@
///////////////////////////////////////////////////////////////////////////////
#pragma mark -
-static CompressedSound *makeCompressedSound(Audio::Mixer *mixer, File *file, const Common::String &basename) {
+static CompressedSound *makeCompressedSound(Audio::Mixer *mixer, Common::File *file, const Common::String &basename) {
#ifdef USE_FLAC
file->open(basename + ".fla");
if (file->isOpen()) {
@@ -451,7 +449,7 @@
char filename[16];
- File *file = new File();
+ Common::File *file = new Common::File();
if (!_hasVoiceFile) {
_voice = makeCompressedSound(_mixer, file, gss->speech_filename);
@@ -506,7 +504,7 @@
void Sound::loadSfxFile(const GameSpecificSettings *gss) {
char filename[16];
- File *file = new File();
+ Common::File *file = new Common::File();
if (!_hasEffectsFile) {
_effects = makeCompressedSound(_mixer, file, gss->effects_filename);
@@ -540,7 +538,7 @@
_mixer->stopHandle(_effectsHandle);
- File *file = new File();
+ Common::File *file = new Common::File();
file->open(filename);
if (file->isOpen() == false) {
@@ -557,7 +555,7 @@
}
// This method is only used by Simon2
-void Sound::loadSfxTable(File *gameFile, uint32 base) {
+void Sound::loadSfxTable(Common::File *gameFile, uint32 base) {
stopAll();
delete _effects;
@@ -572,7 +570,7 @@
void Sound::readVoiceFile(const Common::String &filename) {
_mixer->stopHandle(_voiceHandle);
- File *file = new File();
+ Common::File *file = new Common::File();
file->open(filename);
if (file->isOpen() == false)
@@ -592,7 +590,7 @@
char filename[16];
_lastVoiceFile = _filenums[sound];
sprintf(filename, "voices%d.dat", _filenums[sound]);
- File *file = new File();
+ Common::File *file = new Common::File();
file->open(filename);
if (file->isOpen() == false)
error("playVoice: Can't load voice file %s", filename);
@@ -801,7 +799,7 @@
_lastVoiceFile = disc;
char filename[16];
- File *file = new File();
+ Common::File *file = new Common::File();
if (!_hasVoiceFile) {
sprintf(filename, "%s%d", gss->speech_filename, disc);
Modified: scummvm/trunk/engines/agos/string.cpp
===================================================================
--- scummvm/trunk/engines/agos/string.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/agos/string.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -30,8 +30,6 @@
#include "agos/agos.h"
#include "agos/intern.h"
-using Common::File;
-
namespace AGOS {
void AGOSEngine::uncompressText(byte *ptr) {
@@ -265,7 +263,7 @@
}
uint AGOSEngine::loadTextFile_simon1(const char *filename, byte *dst) {
- File fo;
+ Common::File fo;
fo.open(filename);
uint32 size;
Modified: scummvm/trunk/engines/agos/subroutine.cpp
===================================================================
--- scummvm/trunk/engines/agos/subroutine.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/agos/subroutine.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -30,8 +30,6 @@
#include "agos/agos.h"
#include "agos/intern.h"
-using Common::File;
-
namespace AGOS {
// Script opcodes to load into memory
@@ -262,22 +260,22 @@
_runScriptReturn1 = true;
}
-File *AGOSEngine::openTablesFile(const char *filename) {
+Common::File *AGOSEngine::openTablesFile(const char *filename) {
if (getFeatures() & GF_OLD_BUNDLE)
return openTablesFile_simon1(filename);
else
return openTablesFile_gme(filename);
}
-File *AGOSEngine::openTablesFile_simon1(const char *filename) {
- File *fo = new File();
+Common::File *AGOSEngine::openTablesFile_simon1(const char *filename) {
+ Common::File *fo = new Common::File();
fo->open(filename);
if (fo->isOpen() == false)
error("openTablesFile: Can't open '%s'", filename);
return fo;
}
-File *AGOSEngine::openTablesFile_gme(const char *filename) {
+Common::File *AGOSEngine::openTablesFile_gme(const char *filename) {
uint res;
uint32 offs;
@@ -291,7 +289,7 @@
bool AGOSEngine::loadTablesIntoMem(uint16 subrId) {
byte *p;
uint16 min_num, max_num, file_num;
- File *in;
+ Common::File *in;
char filename[30];
if (_tblList == NULL)
@@ -340,7 +338,7 @@
bool AGOSEngine_Waxworks::loadTablesIntoMem(uint16 subrId) {
byte *p;
uint min_num, max_num;
- File *in;
+ Common::File *in;
p = _tblList;
if (p == NULL)
@@ -407,7 +405,7 @@
int i;
uint min_num, max_num;
char filename[30];
- File *in;
+ Common::File *in;
p = _xtblList;
if (p == NULL)
@@ -457,7 +455,7 @@
return 0;
}
-void AGOSEngine::closeTablesFile(File *in) {
+void AGOSEngine::closeTablesFile(Common::File *in) {
if (getFeatures() & GF_OLD_BUNDLE) {
in->close();
delete in;
Modified: scummvm/trunk/engines/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/dialogs.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/dialogs.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -49,9 +49,6 @@
#include "gui/KeysDialog.h"
#endif
-using GUI::CommandSender;
-using GUI::StaticTextWidget;
-
class ConfigDialog : public GUI::OptionsDialog {
protected:
#ifdef SMALL_SCREEN_DEVICE
@@ -76,15 +73,15 @@
_logo->useThemeTransparency(true);
_logo->setGfx(g_gui.theme()->getImageSurface(GUI::ThemeEngine::kImageLogoSmall));
} else {
- StaticTextWidget *title = new StaticTextWidget(this, "GlobalMenu.Title", "ScummVM");
+ GUI::StaticTextWidget *title = new GUI::StaticTextWidget(this, "GlobalMenu.Title", "ScummVM");
title->setAlign(Graphics::kTextAlignCenter);
}
#else
- StaticTextWidget *title = new StaticTextWidget(this, "GlobalMenu.Title", "ScummVM");
+ GUI::StaticTextWidget *title = new GUI::StaticTextWidget(this, "GlobalMenu.Title", "ScummVM");
title->setAlign(Graphics::kTextAlignCenter);
#endif
- StaticTextWidget *version = new StaticTextWidget(this, "GlobalMenu.Version", gScummVMVersionDate);
+ GUI::StaticTextWidget *version = new GUI::StaticTextWidget(this, "GlobalMenu.Version", gScummVMVersionDate);
version->setAlign(Graphics::kTextAlignCenter);
new GUI::ButtonWidget(this, "GlobalMenu.Resume", _("~R~esume"), 0, kPlayCmd, 'P');
@@ -130,7 +127,7 @@
delete _saveDialog;
}
-void MainMenuDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+void MainMenuDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case kPlayCmd:
close();
@@ -187,16 +184,16 @@
_logo->useThemeTransparency(true);
_logo->setGfx(g_gui.theme()->getImageSurface(GUI::ThemeEngine::kImageLogoSmall));
- GUI::StaticTextWidget *title = (StaticTextWidget *)findWidget("GlobalMenu.Title");
+ GUI::StaticTextWidget *title = (GUI::StaticTextWidget *)findWidget("GlobalMenu.Title");
if (title) {
removeWidget(title);
title->setNext(0);
delete title;
}
} else {
- GUI::StaticTextWidget *title = (StaticTextWidget *)findWidget("GlobalMenu.Title");
+ GUI::StaticTextWidget *title = (GUI::StaticTextWidget *)findWidget("GlobalMenu.Title");
if (!title) {
- title = new StaticTextWidget(this, "GlobalMenu.Title", "ScummVM");
+ title = new GUI::StaticTextWidget(this, "GlobalMenu.Title", "ScummVM");
title->setAlign(Graphics::kTextAlignCenter);
}
@@ -321,7 +318,7 @@
#endif
}
-void ConfigDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+void ConfigDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case kKeysCmd:
Modified: scummvm/trunk/engines/lure/res.cpp
===================================================================
--- scummvm/trunk/engines/lure/res.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/lure/res.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -33,8 +33,6 @@
namespace Lure {
-using namespace Common;
-
static Resources *int_resources = NULL;
Resources &Resources::getReference() {
Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/scumm/dialogs.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -57,8 +57,6 @@
#include "gui/KeysDialog.h"
#endif
-using GUI::CommandSender;
-using GUI::StaticTextWidget;
using Graphics::kTextAlignCenter;
using Graphics::kTextAlignLeft;
using GUI::WIDGET_ENABLED;
@@ -257,7 +255,7 @@
delete _helpDialog;
}
-void ScummMenuDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+void ScummMenuDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case kHelpCmd:
_helpDialog->runModal();
@@ -276,7 +274,7 @@
HelpDialog::HelpDialog(const GameSettings &game)
: ScummDialog("ScummHelp"), _game(game) {
- _title = new StaticTextWidget(this, "ScummHelp.Title", "");
+ _title = new GUI::StaticTextWidget(this, "ScummHelp.Title", "");
_page = 1;
_backgroundType = GUI::ThemeEngine::kDialogBackgroundDefault;
@@ -292,8 +290,8 @@
// Dummy entries
for (int i = 0; i < HELP_NUM_LINES; i++) {
- _key[i] = new StaticTextWidget(this, 0, 0, 10, 10, "", Graphics::kTextAlignRight);
- _dsc[i] = new StaticTextWidget(this, 0, 0, 10, 10, "", Graphics::kTextAlignLeft);
+ _key[i] = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "", Graphics::kTextAlignRight);
+ _dsc[i] = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "", Graphics::kTextAlignLeft);
}
}
@@ -345,7 +343,7 @@
delete[] dscStr;
}
-void HelpDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
+void HelpDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case kNextCmd:
@@ -385,7 +383,7 @@
_message = queryResString(res);
// Width and height are dummy
- _text = new StaticTextWidget(this, 0, 0, 10, 10, _message, kTextAlignCenter);
+ _text = new GUI::StaticTextWidget(this, 0, 0, 10, 10, _message, kTextAlignCenter);
}
InfoDialog::InfoDialog(ScummEngine *scumm, const String& message)
@@ -394,7 +392,7 @@
_message = message;
// Width and height are dummy
- _text = new StaticTextWidget(this, 0, 0, 10, 10, _message, kTextAlignCenter);
+ _text = new GUI::StaticTextWidget(this, 0, 0, 10, 10, _message, kTextAlignCenter);
}
void InfoDialog::setInfoText(const String& message) {
Modified: scummvm/trunk/engines/scumm/file.cpp
===================================================================
--- scummvm/trunk/engines/scumm/file.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/scumm/file.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -27,8 +27,6 @@
#include "scumm/scumm.h"
-using Common::File;
-
namespace Scumm {
#pragma mark -
Modified: scummvm/trunk/engines/scumm/file_nes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/file_nes.cpp 2010-11-01 15:36:31 UTC (rev 54000)
+++ scummvm/trunk/engines/scumm/file_nes.cpp 2010-11-01 16:00:17 UTC (rev 54001)
@@ -28,8 +28,6 @@
#include "common/endian.h"
#include "common/md5.h"
-using Common::File;
-
namespace Scumm {
#pragma mark -
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