Renamed some stuff

svn-id: r35574

3 files changed, 14 insertions, 14 deletions

diff --git a/gui/options.cpp b/gui/options.cpp
index 9a53a425ec..29d0c6a3e1 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -930,8 +930,8 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
 		ThemeBrowser browser;
 		if (browser.runModal() > 0) {
 			// User made his choice...
-			const Common::String &theme = browser.selected();
-			if (0 != theme.compareToIgnoreCase(g_gui.theme()->getThemeFileName()))
+			const Common::String &theme = browser.getSelected();
+			if (!theme.equalsIgnoreCase(g_gui.theme()->getThemeFileName()))
 				if (g_gui.loadNewTheme(theme)) {
 					_curTheme->setLabel(g_gui.theme()->getThemeName());
 					ConfMan.set("gui_theme", theme);
diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp
index a1091ee70d..be79f300ed 100644
--- a/gui/themebrowser.cpp
+++ b/gui/themebrowser.cpp
@@ -92,7 +92,7 @@ void ThemeBrowser::updateListing() {
 	_themes.clear();
 
 	// classic is always built-in
-	Entry th;
+	ThemeDescriptor th;
 	th.name = "ScummVM Classic Theme (Builtin Version)";
 	th.file = "builtin";
 	_themes.push_back(th);
@@ -128,7 +128,7 @@ void ThemeBrowser::updateListing() {
 	// Populate the ListWidget
 	Common::StringList list;
 
-	for (ThList::const_iterator i = _themes.begin(); i != _themes.end(); ++i)
+	for (ThemeDescList::const_iterator i = _themes.begin(); i != _themes.end(); ++i)
 		list.push_back(i->name);
 
 	_fileList->setList(list);
@@ -139,7 +139,7 @@ void ThemeBrowser::updateListing() {
 }
 
 
-void ThemeBrowser::addDir(ThList &list, const Common::FSNode &node) {
+void ThemeBrowser::addDir(ThemeDescList &list, const Common::FSNode &node) {
 	if (!node.exists() || !node.isReadable())
 		return;
 
@@ -151,11 +151,11 @@ void ThemeBrowser::addDir(ThList &list, const Common::FSNode &node) {
 
 	for (Common::FSList::const_iterator i = fslist.begin(); i != fslist.end(); ++i) {
 
-		Entry th;
+		ThemeDescriptor th;
 		if (isTheme(*i, th)) {
 			bool add = true;
 
-			for (ThList::const_iterator p = list.begin(); p != list.end(); ++p) {
+			for (ThemeDescList::const_iterator p = list.begin(); p != list.end(); ++p) {
 				if (p->name == th.name || p->file == th.file) {
 					add = false;
 					break;
@@ -168,7 +168,7 @@ void ThemeBrowser::addDir(ThList &list, const Common::FSNode &node) {
 	}
 }
 
-bool ThemeBrowser::isTheme(const Common::FSNode &node, Entry &out) {
+bool ThemeBrowser::isTheme(const Common::FSNode &node, ThemeDescriptor &out) {
 	out.file = node.getPath();
 
 #ifdef USE_ZLIB
diff --git a/gui/themebrowser.h b/gui/themebrowser.h
index c33e239110..477034d5be 100644
--- a/gui/themebrowser.h
+++ b/gui/themebrowser.h
@@ -42,22 +42,22 @@ public:
 	void open();
 	void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
 
-	const Common::String &selected() const { return _select; }
+	const Common::String &getSelected() const { return _select; }
 private:
-	struct Entry {
+	struct ThemeDescriptor {
 		Common::String name;
 		Common::String file;
 	};
 
 	ListWidget *_fileList;
 	Common::String _select;
-	typedef Common::Array<Entry> ThList;
-	ThList _themes;
+	typedef Common::Array<ThemeDescriptor> ThemeDescList;
+	ThemeDescList _themes;
 
 	void updateListing();
 
-	void addDir(ThList &list, const Common::FSNode &node);
-	bool isTheme(const Common::FSNode &node, Entry &out);
+	void addDir(ThemeDescList &list, const Common::FSNode &node);
+	bool isTheme(const Common::FSNode &node, ThemeDescriptor &out);
 };
 
 } // end of namespace GUI