[Scummvm-cvs-logs] CVS: scummvm/gui message.h,1.15,1.16 message.cpp,1.23,1.24

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27900/gui

Modified Files:
	message.h message.cpp 
Log Message:
Fix doxygen warning

Index: message.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/message.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- message.h	1 Jan 2005 16:09:07 -0000	1.15
+++ message.h	8 May 2005 17:05:19 -0000	1.16
@@ -36,8 +36,6 @@
  * Simple message dialog ("alert box"): presents a text message in a dialog with up to two buttons.
  */
 class MessageDialog : public Dialog {
-	typedef Common::String String;
-	typedef Common::StringList StringList;
 public:
 	MessageDialog(const Common::String &message, const char *defaultButton = "OK", const char *altButton = 0);
 

Index: message.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/message.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- message.cpp	10 Jan 2005 22:05:38 -0000	1.23
+++ message.cpp	8 May 2005 17:05:19 -0000	1.24
@@ -33,13 +33,13 @@
 
 // TODO: The default button should be visibly distinct from the alternate button
 
-MessageDialog::MessageDialog(const String &message, const char *defaultButton, const char *altButton)
+MessageDialog::MessageDialog(const Common::String &message, const char *defaultButton, const char *altButton)
 	: Dialog(30, 20, 260, 124) {
 	// First, determine the size the dialog needs. For this we have to break
 	// down the string into lines, and taking the maximum of their widths.
 	// Using this, and accounting for the space the button(s) need, we can set
 	// the real size of the dialog
-	StringList lines;
+	Common::StringList lines;
 	const char *str = message.c_str();
 	const char *start = str;
 	int lineWidth, maxlineWidth = 0;
@@ -95,10 +95,10 @@
 		addButton(cancelButtonPos, _h - 24, altButton, kCancelCmd, '\27');	// Cancel dialog
 }
 
-int MessageDialog::addLine(StringList &lines, const char *line, int size) {
+int MessageDialog::addLine(Common::StringList &lines, const char *line, int size) {
 	int width = 0, maxWidth = 0;
 	const char *start = line, *pos = line, *end = start + size;
-	String tmp;
+	Common::String tmp;
 	NewGui *gui = &g_gui;
 
 	while (pos < end) {
@@ -115,7 +115,7 @@
 				pos = newPos;
 
 			// Add the substring from intervall [start, i-1]
-			tmp = String(start, pos - start);
+			tmp = Common::String(start, pos - start);
 			lines.push_back(tmp);
 
 			// Determine the width of the string, and adjust maxWidth accordingly
@@ -135,7 +135,7 @@
 		maxWidth = width;
 
 	if (start < pos) {
-		tmp = String(start, pos - start);
+		tmp = Common::String(start, pos - start);
 		lines.push_back(tmp);
 	}
 	return maxWidth;