[Scummvm-cvs-logs] CVS: scummvm/gui EditTextWidget.h,1.7,1.8 ListWidget.cpp,1.24,1.25 ListWidget.h,1.14,1.15 PopUpWidget.cpp,1.17,1.18 PopUpWidget.h,1.2,1.3 about.cpp,1.4,1.5 browser.cpp,1.12,1.13 browser.h,1.7,1.8 chooser.h,1.3,1.4 dialog.cpp,1.30,1.31 dialog.h,1.20,1.21 launcher.cpp,1.49,1.50 launcher.h,1.10,1.11 message.h,1.5,1.6 newgui.h,1.28,1.29 options.h,1.4,1.5 widget.h,1.19,1.20
Max Horn
fingolfin at users.sourceforge.net
Thu Oct 2 10:44:01 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_draw.cpp,1.32,1.33 driver96.h,1.48,1.49 menu.cpp,1.14,1.15 render.cpp,1.31,1.32 render.h,1.6,1.7 sprite.cpp,1.25,1.26
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv18298/gui
Modified Files:
EditTextWidget.h ListWidget.cpp ListWidget.h PopUpWidget.cpp
PopUpWidget.h about.cpp browser.cpp browser.h chooser.h
dialog.cpp dialog.h launcher.cpp launcher.h message.h newgui.h
options.h widget.h
Log Message:
renamed namespace ScummVM to Common
Index: EditTextWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/EditTextWidget.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- EditTextWidget.h 5 May 2003 16:10:19 -0000 1.7
+++ EditTextWidget.h 2 Oct 2003 17:43:01 -0000 1.8
@@ -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;
Index: ListWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ListWidget.cpp 1 Oct 2003 15:00:24 -0000 1.24
+++ ListWidget.cpp 2 Oct 2003 17:43:01 -0000 1.25
@@ -255,7 +255,7 @@
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 @@
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;
Index: ListWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ListWidget.h 6 Mar 2003 21:45:34 -0000 1.14
+++ ListWidget.h 2 Oct 2003 17:43:01 -0000 1.15
@@ -42,8 +42,8 @@
/* 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;
Index: PopUpWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/PopUpWidget.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- PopUpWidget.cpp 1 Oct 2003 15:00:24 -0000 1.17
+++ PopUpWidget.cpp 2 Oct 2003 17:43:01 -0000 1.18
@@ -38,7 +38,7 @@
0x00001000,
};
-const ScummVM::String PopUpWidget::emptyStr;
+const Common::String PopUpWidget::emptyStr;
//
// PopUpDialog
@@ -251,7 +251,7 @@
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) {
Index: PopUpWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/PopUpWidget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PopUpWidget.h 6 Mar 2003 21:45:35 -0000 1.2
+++ PopUpWidget.h 2 Oct 2003 17:43:02 -0000 1.3
@@ -38,13 +38,13 @@
*/
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;
Index: about.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- about.cpp 18 Sep 2003 02:07:17 -0000 1.4
+++ about.cpp 2 Oct 2003 17:43:02 -0000 1.5
@@ -28,11 +28,11 @@
: 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);
Index: browser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/browser.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- browser.cpp 10 Aug 2003 20:57:41 -0000 1.12
+++ browser.cpp 2 Oct 2003 17:43:02 -0000 1.13
@@ -143,7 +143,7 @@
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());
Index: browser.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/browser.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- browser.h 25 Mar 2003 15:32:33 -0000 1.7
+++ browser.h 2 Oct 2003 17:43:02 -0000 1.8
@@ -32,8 +32,8 @@
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();
Index: chooser.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/chooser.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- chooser.h 6 Mar 2003 21:45:37 -0000 1.3
+++ chooser.h 2 Oct 2003 17:43:02 -0000 1.4
@@ -33,8 +33,8 @@
*/
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);
Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- dialog.cpp 23 Jul 2003 16:44:15 -0000 1.30
+++ dialog.cpp 2 Oct 2003 17:43:02 -0000 1.31
@@ -279,11 +279,11 @@
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);
}
Index: dialog.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- dialog.h 1 Aug 2003 12:20:17 -0000 1.20
+++ dialog.h 2 Oct 2003 17:43:02 -0000 1.21
@@ -82,8 +82,8 @@
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; }
};
Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- launcher.cpp 18 Sep 2003 02:07:17 -0000 1.49
+++ launcher.cpp 2 Oct 2003 17:43:02 -0000 1.50
@@ -48,7 +48,7 @@
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 @@
};
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::updateListing() {
int i;
- ScummVM::StringList l;
+ Common::StringList l;
// Retrieve a list of all games defined in the config file
_domains.clear();
Index: launcher.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- launcher.h 6 Mar 2003 21:45:40 -0000 1.10
+++ launcher.h 2 Oct 2003 17:43:02 -0000 1.11
@@ -30,8 +30,8 @@
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();
Index: message.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/message.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- message.h 6 Mar 2003 21:45:42 -0000 1.5
+++ message.h 2 Oct 2003 17:43:02 -0000 1.6
@@ -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);
Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- newgui.h 1 Oct 2003 15:00:26 -0000 1.28
+++ newgui.h 2 Oct 2003 17:43:02 -0000 1.29
@@ -62,7 +62,7 @@
// 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
Index: options.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- options.h 26 Mar 2003 20:43:58 -0000 1.4
+++ options.h 2 Oct 2003 17:43:02 -0000 1.5
@@ -30,7 +30,7 @@
class PopUpWidget;
class GlobalOptionsDialog : public Dialog {
- typedef ScummVM::String String;
+ typedef Common::String String;
public:
GlobalOptionsDialog(NewGui *gui, GameDetector &detector);
~GlobalOptionsDialog();
Index: widget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- widget.h 1 Aug 2003 12:20:17 -0000 1.19
+++ widget.h 2 Oct 2003 17:43:02 -0000 1.20
@@ -134,7 +134,7 @@
/* StaticTextWidget */
class StaticTextWidget : public Widget {
protected:
- typedef ScummVM::String String;
+ typedef Common::String String;
String _label;
int _align;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_draw.cpp,1.32,1.33 driver96.h,1.48,1.49 menu.cpp,1.14,1.15 render.cpp,1.31,1.32 render.h,1.6,1.7 sprite.cpp,1.25,1.26
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list