From 523d8e64c0bc66b75cdd7f12fc9d9d87b28a8c36 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 8 Sep 2002 01:08:12 +0000
Subject: rewrote config class; cleanup; code restructuring

svn-id: r4903
---
 gui/ListWidget.cpp | 2 +-
 gui/dialog.cpp     | 8 ++++----
 gui/gui.cpp        | 8 ++++----
 gui/newgui.h       | 2 +-
 gui/widget.h       | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'gui')

diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp
index 22d68c74d1..4607698447 100644
--- a/gui/ListWidget.cpp
+++ b/gui/ListWidget.cpp
@@ -231,7 +231,7 @@ void ListWidget::drawWidget(bool hilite)
 
 		buffer += _list[pos];
 	
-		gui->drawString(buffer, _x+5, _y+2 + LINE_HEIGHT * i, _w - 10,
+		gui->drawString(buffer.c_str(), _x+5, _y+2 + LINE_HEIGHT * i, _w - 10,
 							(_selectedItem == pos && _hasFocus) ? gui->_textcolorhi : gui->_textcolor);
 	}
 }
diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index 3e14209fe2..7504539eb6 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -328,7 +328,7 @@ void SaveLoadDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
 			s->_saveLoadSlot = _savegameList->getSelected();
 			s->_saveLoadCompatible = false;
 			s->_saveLoadFlag = 1;		// 1 for save, I assume (Painelf)
-			strcpy(s->_saveLoadName, _savegameList->getSelectedString());
+			strcpy(s->_saveLoadName, _savegameList->getSelectedString().c_str());
 			close();
 		}
 		break;
@@ -494,9 +494,9 @@ void SoundDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data)
 		scumm->_mixer->setVolume(_soundVolumeSfx);
 		scumm->_mixer->setMusicVolume(_soundVolumeMusic);
 		
-		scummcfg->set("master_volume", _soundVolumeMaster);
-		scummcfg->set("music_volume", _soundVolumeMusic);
-		scummcfg->set("sfx_volume", _soundVolumeSfx);
+		scummcfg->setInt("master_volume", _soundVolumeMaster);
+		scummcfg->setInt("music_volume", _soundVolumeMusic);
+		scummcfg->setInt("sfx_volume", _soundVolumeSfx);
 		scummcfg->flush();
 		}
 	case kCancelCmd:
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 8e118ed792..ff989812c9 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "stdafx.h"
-#include "scumm.h"
+#include "scumm/scumm.h"
 #include "sound/mididrv.h"
 #include "scumm/sound.h"
 #include "scumm/imuse.h"
@@ -625,9 +625,9 @@ void Gui::handleSoundDialogCommand(int cmd)
 		_s->_mixer->setVolume(_s->_sound->_sound_volume_sfx);
 		_s->_mixer->setMusicVolume(_s->_sound->_sound_volume_music);
 
-		scummcfg->set("master_volume", _s->_sound->_sound_volume_master);
-		scummcfg->set("music_volume", _s->_sound->_sound_volume_music);
-		scummcfg->set("sfx_volume", _s->_sound->_sound_volume_sfx);
+		scummcfg->setInt("master_volume", _s->_sound->_sound_volume_master);
+		scummcfg->setInt("music_volume", _s->_sound->_sound_volume_music);
+		scummcfg->setInt("sfx_volume", _s->_sound->_sound_volume_sfx);
 		scummcfg->flush();
 
 		close();
diff --git a/gui/newgui.h b/gui/newgui.h
index f78f31ee2d..b63ef50d9c 100644
--- a/gui/newgui.h
+++ b/gui/newgui.h
@@ -23,7 +23,7 @@
 
 #include "scummsys.h"
 #include "system.h"	// For events
-#include "util.h"
+#include "common/list.h"
 
 class Dialog;
 class Scumm;
diff --git a/gui/widget.h b/gui/widget.h
index 67e81044d1..3a39b35ae0 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -22,7 +22,7 @@
 #define WIDGET_H
 
 #include "scummsys.h"
-#include "common/util.h"
+#include "common/str.h"
 
 class Dialog;
 
-- 
cgit v1.2.3