From 936f5585794972bb76b25164890315786dbe3401 Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Sun, 27 Jun 2010 05:12:37 +0000
Subject: Improved getDefaultConfigFileName(). Code cleanup.

svn-id: r50364
---
 backends/platform/sdl/win32/win32.cpp | 25 ++++---------------------
 backends/platform/sdl/win32/win32.h   |  4 ----
 2 files changed, 4 insertions(+), 25 deletions(-)

(limited to 'backends/platform/sdl/win32')

diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 907059feaf..28cb13def4 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -30,22 +30,9 @@
 #undef ARRAYSIZE
 
 #include "backends/platform/sdl/win32/win32.h"
-#include "common/archive.h"
-#include "common/config-manager.h"
-#include "common/debug.h"
-#include "common/util.h"
-
-#include "backends/saves/default/default-saves.h"
-#include "backends/audiocd/sdl/sdl-audiocd.h"
-#include "backends/events/sdl/sdl-events.h"
-#include "backends/mutex/sdl/sdl-mutex.h"
-#include "backends/mixer/sdl/sdl-mixer.h"
-#include "backends/timer/sdl/sdl-timer.h"
-
 #include "backends/fs/windows/windows-fs-factory.h"
 
-OSystem_Win32::OSystem_Win32() {
-}
+#define DEFAULT_CONFIG_FILE "scummvm.ini"
 
 void OSystem_Win32::init() {
 	// Initialze File System Factory
@@ -55,10 +42,6 @@ void OSystem_Win32::init() {
 	OSystem_SDL::init();
 }
 
-const char *OSystem_Win32::getConfigFileNameString() {
-	return "\\scummvm.ini";
-}
-
 Common::String OSystem_Win32::getDefaultConfigFileName() {
 	char configFile[MAXPATHLEN];
 
@@ -82,14 +65,14 @@ Common::String OSystem_Win32::getDefaultConfigFileName() {
 
 		strcat(configFile, "\\ScummVM");
 		CreateDirectory(configFile, NULL);
-		strcat(configFile, getConfigFileNameString());
+		strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
 
 		FILE *tmp = NULL;
 		if ((tmp = fopen(configFile, "r")) == NULL) {
 			// Check windows directory
 			char oldConfigFile[MAXPATHLEN];
 			GetWindowsDirectory(oldConfigFile, MAXPATHLEN);
-			strcat(oldConfigFile, getConfigFileNameString());
+			strcat(oldConfigFile, "\\" DEFAULT_CONFIG_FILE);
 			if ((tmp = fopen(oldConfigFile, "r"))) {
 				strcpy(configFile, oldConfigFile);
 
@@ -101,7 +84,7 @@ Common::String OSystem_Win32::getDefaultConfigFileName() {
 	} else {
 		// Check windows directory
 		GetWindowsDirectory(configFile, MAXPATHLEN);
-		strcat(configFile, getConfigFileNameString());
+		strcat(configFile, "\\" DEFAULT_CONFIG_FILE);
 	}
 
 	return configFile;
diff --git a/backends/platform/sdl/win32/win32.h b/backends/platform/sdl/win32/win32.h
index e8bc255459..7ae8802fc1 100644
--- a/backends/platform/sdl/win32/win32.h
+++ b/backends/platform/sdl/win32/win32.h
@@ -30,13 +30,9 @@
 
 class OSystem_Win32 : public OSystem_SDL {
 public:
-	OSystem_Win32();
-	~OSystem_Win32() {}
-
 	void init();
 
 protected:
-	const char *getConfigFileNameString();
 	Common::String getDefaultConfigFileName();
 };
 
-- 
cgit v1.2.3