Rename remaining OSystem methods to match our coding guidelines

svn-id: r15332

6 files changed, 12 insertions, 12 deletions

diff --git a/gui/EditTextWidget.cpp b/gui/EditTextWidget.cpp
index daa0bfd5b0..ea24035b11 100644
--- a/gui/EditTextWidget.cpp
+++ b/gui/EditTextWidget.cpp
@@ -42,7 +42,7 @@ EditTextWidget::EditTextWidget(GuiObject *boss, int x, int y, int w, int h, cons
 }
 
 void EditTextWidget::handleTickle() {
-	uint32 time = g_system->get_msecs();
+	uint32 time = g_system->getMillis();
 	if (_caretTime < time) {
 		_caretTime = time + kCaretBlinkTime;
 		drawCaret(_caretVisible);
diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp
index 4ef2d6f56b..506785e332 100644
--- a/gui/ListWidget.cpp
+++ b/gui/ListWidget.cpp
@@ -88,7 +88,7 @@ void ListWidget::scrollBarRecalc() {
 }
 
 void ListWidget::handleTickle() {
-	uint32 time = g_system->get_msecs();
+	uint32 time = g_system->getMillis();
 	if (_editMode && _caretTime < time) {
 		_caretTime = time + kCaretBlinkTime;
 		drawCaret(_caretVisible);
@@ -150,7 +150,7 @@ bool ListWidget::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
 		// Only works in a useful fashion if the list entries are sorted.
 		// TODO: Maybe this should be off by default, and instead we add a
 		// method "enableQuickSelect()" or so ?
-		uint32 time = g_system->get_msecs();
+		uint32 time = g_system->getMillis();
 		if (_quickSelectTime < time) {
 			_quickSelectStr = (char)ascii;
 		} else {
diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp
index 98fbdfcfde..11524d316f 100644
--- a/gui/PopUpWidget.cpp
+++ b/gui/PopUpWidget.cpp
@@ -102,7 +102,7 @@ PopUpDialog::PopUpDialog(PopUpWidget *boss, int clickX, int clickY)
 	_clickY = clickY - _y;
 
 	// Time the popup was opened
-	_openTime = g_system->get_msecs();
+	_openTime = g_system->getMillis();
 }
 
 void PopUpDialog::drawDialog() {
@@ -125,7 +125,7 @@ void PopUpDialog::handleMouseUp(int x, int y, int button, int clickCount) {
 	// Mouse was released. If it wasn't moved much since the original mouse down, 
 	// let the popup stay open. If it did move, assume the user made his selection.
 	int dist = (_clickX - x) * (_clickX - x) + (_clickY - y) * (_clickY - y);
-	if (dist > 3 * 3 || g_system->get_msecs() - _openTime > 300) {
+	if (dist > 3 * 3 || g_system->getMillis() - _openTime > 300) {
 		setResult(_selection);
 		close();
 	}
diff --git a/gui/console.cpp b/gui/console.cpp
index 325b00691d..43a6d5ca04 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -139,7 +139,7 @@ void ConsoleDialog::drawDialog() {
 }
 
 void ConsoleDialog::handleTickle() {
-	uint32 time = g_system->get_msecs();
+	uint32 time = g_system->getMillis();
 	if (_caretTime < time) {
 		_caretTime = time + kCaretBlinkTime;
 		drawCaret(_caretVisible);
diff --git a/gui/message.cpp b/gui/message.cpp
index 95b6ecfaf4..8adb7fca4e 100644
--- a/gui/message.cpp
+++ b/gui/message.cpp
@@ -156,12 +156,12 @@ void MessageDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
 
 TimedMessageDialog::TimedMessageDialog(const Common::String &message, uint32 duration)
 	: MessageDialog(message, 0, 0) {
-	_timer = g_system->get_msecs() + duration;
+	_timer = g_system->getMillis() + duration;
 }
 
 void TimedMessageDialog::handleTickle() {
 	MessageDialog::handleTickle();
-	if (g_system->get_msecs() > _timer)
+	if (g_system->getMillis() > _timer)
 		close();
 }
 
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index 767c5776c9..ab9d91c8f1 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -107,9 +107,9 @@ void NewGui::runLoop() {
 		_system->updateScreen();		
 
 		OSystem::Event event;
-		uint32 time = _system->get_msecs();
+		uint32 time = _system->getMillis();
 
-		while (_system->poll_event(&event)) {
+		while (_system->pollEvent(event)) {
 			switch (event.event_code) {
 			case OSystem::EVENT_KEYDOWN:
 #if !defined(__PALM_OS__)
@@ -177,7 +177,7 @@ void NewGui::runLoop() {
 		}
 
 		// Delay for a moment
-		_system->delay_msecs(10);
+		_system->delayMillis(10);
 	}
 	
 	if (didSaveState)
@@ -413,7 +413,7 @@ void NewGui::drawBitmap(uint32 *bitmap, int x, int y, OverlayColor color, int h)
 // We could plug in a different cursor here if we like to.
 //
 void NewGui::animateCursor() {
-	int time = _system->get_msecs(); 
+	int time = _system->getMillis(); 
 	if (time > _cursorAnimateTimer + kCursorAnimateDelay) {
 		const byte colors[4] = { 15, 15, 7, 8 };
 		const byte color = colors[_cursorAnimateCounter];