diff options
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/dialogs.cpp | 16 | ||||
| -rw-r--r-- | engines/scumm/file.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/file_nes.cpp | 2 |
3 files changed, 7 insertions, 13 deletions
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index 093a103cc8..1cdc9e3ff0 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -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 @@ ScummMenuDialog::~ScummMenuDialog() { 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 @@ enum { 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 @@ HelpDialog::HelpDialog(const GameSettings &game) // 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 @@ void HelpDialog::displayKeyBindings() { 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 @@ InfoDialog::InfoDialog(ScummEngine *scumm, int res) _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 @@ InfoDialog::InfoDialog(ScummEngine *scumm, const String& message) _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) { diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp index 0081720d03..08feb7ffd5 100644 --- a/engines/scumm/file.cpp +++ b/engines/scumm/file.cpp @@ -27,8 +27,6 @@ #include "scumm/scumm.h" -using Common::File; - namespace Scumm { #pragma mark - diff --git a/engines/scumm/file_nes.cpp b/engines/scumm/file_nes.cpp index cd761db81a..bfd45d8005 100644 --- a/engines/scumm/file_nes.cpp +++ b/engines/scumm/file_nes.cpp @@ -28,8 +28,6 @@ #include "common/endian.h" #include "common/md5.h" -using Common::File; - namespace Scumm { #pragma mark - |