aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/EditTextWidget.h4
-rw-r--r--gui/ListWidget.cpp4
-rw-r--r--gui/ListWidget.h4
-rw-r--r--gui/PopUpWidget.cpp4
-rw-r--r--gui/PopUpWidget.h4
-rw-r--r--gui/about.cpp4
-rw-r--r--gui/browser.cpp2
-rw-r--r--gui/browser.h4
-rw-r--r--gui/chooser.h4
-rw-r--r--gui/dialog.cpp4
-rw-r--r--gui/dialog.h4
-rw-r--r--gui/launcher.cpp8
-rw-r--r--gui/launcher.h4
-rw-r--r--gui/message.h4
-rw-r--r--gui/newgui.h2
-rw-r--r--gui/options.h2
-rw-r--r--gui/widget.h2
17 files changed, 32 insertions, 32 deletions
diff --git a/gui/EditTextWidget.h b/gui/EditTextWidget.h
index c81e50a29f..1b121c0a1f 100644
--- a/gui/EditTextWidget.h
+++ b/gui/EditTextWidget.h
@@ -27,8 +27,8 @@
/* EditTextWidget */
class EditTextWidget : public StaticTextWidget {
- typedef ScummVM::StringList StringList;
- typedef ScummVM::String String;
+ typedef Common::StringList StringList;
+ typedef Common::String String;
protected:
String _backupString;
bool _caretVisible;
diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp
index 50f3a724e2..2d3e9a7161 100644
--- a/gui/ListWidget.cpp
+++ b/gui/ListWidget.cpp
@@ -255,7 +255,7 @@ void ListWidget::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
void ListWidget::drawWidget(bool hilite) {
NewGui *gui = _boss->getGui();
int i, pos, len = _list.size();
- ScummVM::String buffer;
+ Common::String buffer;
// Draw a thin frame around the list.
gui->hLine(_x, _y, _x + _w - 1, gui->_color);
@@ -296,7 +296,7 @@ void ListWidget::drawCaret(bool erase) {
int16 color = erase ? gui->_textcolorhi : gui->_bgcolor;
int x = _x + _boss->getX() + 3;
int y = _y + _boss->getY() + 1;
- ScummVM::String buffer;
+ Common::String buffer;
y += (_selectedItem - _currentPos) * kLineHeight;
diff --git a/gui/ListWidget.h b/gui/ListWidget.h
index 1fc6d28807..f61ff55259 100644
--- a/gui/ListWidget.h
+++ b/gui/ListWidget.h
@@ -42,8 +42,8 @@ enum {
/* ListWidget */
class ListWidget : public Widget, public CommandReceiver, public CommandSender {
- typedef ScummVM::StringList StringList;
- typedef ScummVM::String String;
+ typedef Common::StringList StringList;
+ typedef Common::String String;
protected:
StringList _list;
bool _editable;
diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp
index bdff005297..d6b5af978d 100644
--- a/gui/PopUpWidget.cpp
+++ b/gui/PopUpWidget.cpp
@@ -38,7 +38,7 @@ static uint32 up_down_arrows[8] = {
0x00001000,
};
-const ScummVM::String PopUpWidget::emptyStr;
+const Common::String PopUpWidget::emptyStr;
//
// PopUpDialog
@@ -251,7 +251,7 @@ void PopUpDialog::drawMenuEntry(int entry, bool hilite) {
int x = _x + 1;
int y = _y + 1 + kLineHeight * entry;
int w = _w - 2;
- ScummVM::String &name = _popUpBoss->_entries[entry].name;
+ Common::String &name = _popUpBoss->_entries[entry].name;
_gui->fillRect(x, y, w, kLineHeight, hilite ? _gui->_textcolorhi : _gui->_bgcolor);
if (name.size() == 0) {
diff --git a/gui/PopUpWidget.h b/gui/PopUpWidget.h
index c27ce80f53..0027fe0ea6 100644
--- a/gui/PopUpWidget.h
+++ b/gui/PopUpWidget.h
@@ -38,13 +38,13 @@ enum {
*/
class PopUpWidget : public Widget, public CommandSender {
friend class PopUpDialog;
- typedef ScummVM::String String;
+ typedef Common::String String;
struct Entry {
String name;
uint32 tag;
};
- typedef ScummVM::List<Entry> EntryList;
+ typedef Common::List<Entry> EntryList;
protected:
static const String emptyStr;
diff --git a/gui/about.cpp b/gui/about.cpp
index 99f054b18e..e94a6b9598 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -28,11 +28,11 @@ AboutDialog::AboutDialog(NewGui *gui)
: Dialog(gui, 10, 20, 300, 124) {
addButton((_w - kButtonWidth)/2, 100, "OK", kCloseCmd, '\r'); // Close dialog - FIXME
- ScummVM::String version("ScummVM ");
+ Common::String version("ScummVM ");
version += gScummVMVersion;
new StaticTextWidget(this, 10, 10, _w - 20, kLineHeight, version, kTextAlignCenter);
- ScummVM::String date("(built on ");
+ Common::String date("(built on ");
date += gScummVMBuildDate;
date += ')';
new StaticTextWidget(this, 10, 20, _w - 20, kLineHeight, date, kTextAlignCenter);
diff --git a/gui/browser.cpp b/gui/browser.cpp
index 8eed83edf5..af935c3c0b 100644
--- a/gui/browser.cpp
+++ b/gui/browser.cpp
@@ -143,7 +143,7 @@ void BrowserDialog::updateListing() {
assert(_nodeContent != NULL);
// Populate the ListWidget
- ScummVM::StringList list;
+ Common::StringList list;
int size = _nodeContent->size();
for (int i = 0; i < size; i++) {
list.push_back((*_nodeContent)[i].displayName());
diff --git a/gui/browser.h b/gui/browser.h
index d7c41a9957..640570ad41 100644
--- a/gui/browser.h
+++ b/gui/browser.h
@@ -32,8 +32,8 @@ class FilesystemNode;
class FSList;
class BrowserDialog : public Dialog {
- typedef ScummVM::String String;
- typedef ScummVM::StringList StringList;
+ typedef Common::String String;
+ typedef Common::StringList StringList;
public:
BrowserDialog(NewGui *gui, const char *title);
virtual ~BrowserDialog();
diff --git a/gui/chooser.h b/gui/chooser.h
index e9d2df1716..81374bf3dc 100644
--- a/gui/chooser.h
+++ b/gui/chooser.h
@@ -33,8 +33,8 @@ class ListWidget;
*/
class ChooserDialog : public Dialog {
- typedef ScummVM::String String;
- typedef ScummVM::StringList StringList;
+ typedef Common::String String;
+ typedef Common::StringList StringList;
public:
ChooserDialog(NewGui *gui, const String title, const StringList &list);
diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index 0a3c9ae0b8..0c0e4a73b7 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -279,11 +279,11 @@ Widget *Dialog::findWidget(int x, int y) {
return w;
}
-ButtonWidget *Dialog::addButton(int x, int y, const ScummVM::String &label, uint32 cmd, char hotkey) {
+ButtonWidget *Dialog::addButton(int x, int y, const Common::String &label, uint32 cmd, char hotkey) {
return new ButtonWidget(this, x, y, kButtonWidth, 16, label, cmd, hotkey);
}
-PushButtonWidget *Dialog::addPushButton(int x, int y, const ScummVM::String &label, uint32 cmd, char hotkey) {
+PushButtonWidget *Dialog::addPushButton(int x, int y, const Common::String &label, uint32 cmd, char hotkey) {
return new PushButtonWidget(this, x, y, kButtonWidth, 16, label, cmd, hotkey);
}
diff --git a/gui/dialog.h b/gui/dialog.h
index e3286fa475..02fd13324a 100644
--- a/gui/dialog.h
+++ b/gui/dialog.h
@@ -82,8 +82,8 @@ protected:
Widget *findWidget(int x, int y); // Find the widget at pos x,y if any
- ButtonWidget *addButton(int x, int y, const ScummVM::String &label, uint32 cmd, char hotkey);
- PushButtonWidget *addPushButton(int x, int y, const ScummVM::String &label, uint32 cmd, char hotkey);
+ ButtonWidget *addButton(int x, int y, const Common::String &label, uint32 cmd, char hotkey);
+ PushButtonWidget *addPushButton(int x, int y, const Common::String &label, uint32 cmd, char hotkey);
void setResult(int result) { _result = result; }
};
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index d231519f67..3f12bfd057 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -48,7 +48,7 @@ enum {
kQuitCmd = 'QUIT'
};
-typedef ScummVM::List<const TargetSettings *> GameList;
+typedef Common::List<const TargetSettings *> GameList;
/*
* A dialog that allows the user to edit a config game entry.
@@ -75,8 +75,8 @@ enum {
};
class EditGameDialog : public Dialog {
- typedef ScummVM::String String;
- typedef ScummVM::StringList StringList;
+ typedef Common::String String;
+ typedef Common::StringList StringList;
public:
EditGameDialog(NewGui *gui, const String &domain, const TargetSettings *target);
@@ -229,7 +229,7 @@ void LauncherDialog::close() {
void LauncherDialog::updateListing() {
int i;
- ScummVM::StringList l;
+ Common::StringList l;
// Retrieve a list of all games defined in the config file
_domains.clear();
diff --git a/gui/launcher.h b/gui/launcher.h
index 3c13ea442f..4aae8bd9e3 100644
--- a/gui/launcher.h
+++ b/gui/launcher.h
@@ -30,8 +30,8 @@ class GameDetector;
class ListWidget;
class LauncherDialog : public Dialog {
- typedef ScummVM::String String;
- typedef ScummVM::StringList StringList;
+ typedef Common::String String;
+ typedef Common::StringList StringList;
public:
LauncherDialog(NewGui *gui, GameDetector &detector);
~LauncherDialog();
diff --git a/gui/message.h b/gui/message.h
index 63cca41c80..69f630a538 100644
--- a/gui/message.h
+++ b/gui/message.h
@@ -26,8 +26,8 @@
#include "common/list.h"
class MessageDialog : public Dialog {
- typedef ScummVM::String String;
- typedef ScummVM::StringList StringList;
+ typedef Common::String String;
+ typedef Common::StringList StringList;
public:
MessageDialog(NewGui *gui, const String &message, uint32 timer = 0, bool showOKButton = true, bool showCancelButton = false);
diff --git a/gui/newgui.h b/gui/newgui.h
index 1f1012061f..b610825b3d 100644
--- a/gui/newgui.h
+++ b/gui/newgui.h
@@ -62,7 +62,7 @@ public:
// This class hopefully will replace the old Gui class completly one day
class NewGui {
friend class Dialog;
- typedef ScummVM::String String;
+ typedef Common::String String;
public:
// Main entry for the GUI: this will start an event loop that keeps running
diff --git a/gui/options.h b/gui/options.h
index 4ff51bb266..db25eee8a8 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -30,7 +30,7 @@ class GameDetector;
class PopUpWidget;
class GlobalOptionsDialog : public Dialog {
- typedef ScummVM::String String;
+ typedef Common::String String;
public:
GlobalOptionsDialog(NewGui *gui, GameDetector &detector);
~GlobalOptionsDialog();
diff --git a/gui/widget.h b/gui/widget.h
index e1c77b959f..f6954fe569 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -134,7 +134,7 @@ protected:
/* StaticTextWidget */
class StaticTextWidget : public Widget {
protected:
- typedef ScummVM::String String;
+ typedef Common::String String;
String _label;
int _align;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 00:43:44 +0000