From c40dedc21f154089c543ce717ad46d22bd87eca5 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 20 Dec 2005 20:43:29 +0000
Subject: [PATCH] cleanup, don't pull in <windows.h>

---
 .../src/archutils/Win32/RegistryAccess.cpp      |  2 ++
 stepmania/src/archutils/Win32/RegistryAccess.h  | 17 ++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/archutils/Win32/RegistryAccess.cpp b/stepmania/src/archutils/Win32/RegistryAccess.cpp
index 173136bf98..c2acabf045 100644
--- a/stepmania/src/archutils/Win32/RegistryAccess.cpp
+++ b/stepmania/src/archutils/Win32/RegistryAccess.cpp
@@ -3,6 +3,8 @@
 #include "RageLog.h"
 #include "RageUtil.h"
 
+#include <windows.h>
+
 /* Given "HKEY_LOCAL_MACHINE\hardware\foo", return "hardware\foo", and place
  * the HKEY_LOCAL_MACHINE constant in key. */
 static bool GetRegKeyType( const RString &sIn, RString &sOut, HKEY &key )
diff --git a/stepmania/src/archutils/Win32/RegistryAccess.h b/stepmania/src/archutils/Win32/RegistryAccess.h
index 4a4553dc10..49dddba42d 100644
--- a/stepmania/src/archutils/Win32/RegistryAccess.h
+++ b/stepmania/src/archutils/Win32/RegistryAccess.h
@@ -1,20 +1,19 @@
 /* RegistryAccess - Windows registry helpers */
+
 #ifndef REGISTRY_ACCESS_H
 #define REGISTRY_ACCESS_H
 
-#include <windows.h>
-
 namespace RegistryAccess
 {
-	bool GetRegValue( const RString &key, const RString &sName, RString &val );
-	bool GetRegValue( const RString &key, const RString &sName, int &val );
-	bool GetRegValue( const RString &key, const RString &sName, bool &val );
+	bool GetRegValue( const RString &sKey, const RString &sName, RString &val );
+	bool GetRegValue( const RString &sKey, const RString &sName, int &val );
+	bool GetRegValue( const RString &sKey, const RString &sName, bool &val );
 
-	bool GetRegSubKeys( const RString &key, vector<RString> &lst, const RString &regex = ".*", bool bReturnPathToo = true );
+	bool GetRegSubKeys( const RString &sKey, vector<RString> &asList, const RString &sRegex = ".*", bool bReturnPathToo = true );
 
-	bool SetRegValue( const RString &key, const RString &sName, const RString &val );
-	bool SetRegValue( const RString &key, const RString &sName, int val );
-	bool SetRegValue( const RString &key, const RString &sName, bool val );
+	bool SetRegValue( const RString &sKey, const RString &sName, const RString &val );
+	bool SetRegValue( const RString &sKey, const RString &sName, int val );
+	bool SetRegValue( const RString &sKey, const RString &sName, bool val );
 }
 
 #endif