From 92d219715f1fc8b3535cfce370084bd56596c2ef Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 29 Feb 2012 11:43:21 +0100
Subject: COMMON: Replace OptionsDialog::renderType2GUIO by API in rendermode.h

---
 gui/options.cpp | 29 ++---------------------------
 gui/options.h   |  2 --
 2 files changed, 2 insertions(+), 29 deletions(-)

(limited to 'gui')

diff --git a/gui/options.cpp b/gui/options.cpp
index 5085f9cdd9..39f8d9ccb6 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -750,7 +750,7 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
 	}
 
 	// RenderMode popup
-	const Common::String allFlags = renderType2GUIO((uint32)-1);
+	const Common::String allFlags = Common::allRenderModesGUIOs();
 	bool renderingTypeDefined = (strpbrk(_guioptions.c_str(), allFlags.c_str()) != NULL);
 
 	_renderModePopUpDesc = new StaticTextWidget(boss, prefix + "grRenderPopupDesc", _("Render mode:"), _("Special dithering modes supported by some games"));
@@ -759,7 +759,7 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
 	_renderModePopUp->appendEntry("");
 	const Common::RenderModeDescription *rm = Common::g_renderModes;
 	for (; rm->code; ++rm) {
-		Common::String renderGuiOption = renderType2GUIO(rm->id);
+		Common::String renderGuiOption = Common::renderMode2GUIO(rm->id);
 		if ((_domain == Common::ConfigManager::kApplicationDomain) || (_domain != Common::ConfigManager::kApplicationDomain && !renderingTypeDefined) || (_guioptions.contains(renderGuiOption)))
 			_renderModePopUp->appendEntry(_c(rm->description, context), rm->id);
 	}
@@ -1040,31 +1040,6 @@ void OptionsDialog::saveMusicDeviceSetting(PopUpWidget *popup, Common::String se
 		ConfMan.removeKey(setting, _domain);
 }
 
-Common::String OptionsDialog::renderType2GUIO(uint32 renderType) {
-	static const struct {
-		Common::RenderMode type;
-		const char *guio;
-	} renderGUIOMapping[] = {
-		{ Common::kRenderHercG,		GUIO_RENDERHERCGREEN },
-		{ Common::kRenderHercA,		GUIO_RENDERHERCAMBER },
-		{ Common::kRenderCGA,		GUIO_RENDERCGA },
-		{ Common::kRenderEGA,		GUIO_RENDEREGA },
-		{ Common::kRenderVGA,		GUIO_RENDERVGA },
-		{ Common::kRenderAmiga,		GUIO_RENDERAMIGA },
-		{ Common::kRenderFMTowns,	GUIO_RENDERFMTOWNS },
-		{ Common::kRenderPC9821,	GUIO_RENDERPC9821 },
-		{ Common::kRenderPC9801,	GUIO_RENDERPC9801 }
-	};
-	Common::String res;
-
-	for (int i = 0; i < ARRAYSIZE(renderGUIOMapping); i++) {
-		if (renderType == renderGUIOMapping[i].type || renderType == (uint32)-1)
-			res += renderGUIOMapping[i].guio;
-	}
-
-	return res;
-}
-
 int OptionsDialog::getSubtitleMode(bool subtitles, bool speech_mute) {
 	if (_guioptions.contains(GUIO_NOSUBTITLES))
 		return kSubtitlesSpeech; // Speech only
diff --git a/gui/options.h b/gui/options.h
index 83c9d60d59..05b3cac617 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -85,8 +85,6 @@ protected:
 	bool loadMusicDeviceSetting(PopUpWidget *popup, Common::String setting, MusicType preferredType = MT_AUTO);
 	void saveMusicDeviceSetting(PopUpWidget *popup, Common::String setting);
 
-	Common::String renderType2GUIO(uint32 renderType);
-
 	TabWidget *_tabWidget;
 	int _graphicsTabId;
 	int _midiTabId;
-- 
cgit v1.2.3