From 027b94d2c1f17f436adbdcc520cbbdfb7a47184f Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Thu, 7 Dec 2006 13:00:30 +0000
Subject: [PATCH] Use descriptive names.

---
 stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp | 4 ++--
 stepmania/src/archutils/Unix/X11Helper.cpp               | 4 ++--
 stepmania/src/archutils/Unix/X11Helper.h                 | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
index 13fa721d9b..f68c9e6fea 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
@@ -32,7 +32,7 @@ static PWSWAPINTERVALEXTPROC glSwapInterval = NULL;
 static LocalizedString FAILED_CONNECTION_XSERVER( "LowLevelWindow_X11", "Failed to establish a connection with the X server" );
 LowLevelWindow_X11::LowLevelWindow_X11()
 {
-	if( !Go() )
+	if( !OpenXConnection() )
 		RageException::Throw( FAILED_CONNECTION_XSERVER.GetValue() );
 
 	const int iScreen = DefaultScreen( Dpy );
@@ -79,7 +79,7 @@ LowLevelWindow_X11::~LowLevelWindow_X11()
 	Win = None;
 	XDestroyWindow( Dpy, g_AltWindow );
 	g_AltWindow = None;
-	Stop();	// Xlib cleans up the window for us
+	CloseXConnection();
 }
 
 void *LowLevelWindow_X11::GetProcAddress( RString s )
diff --git a/stepmania/src/archutils/Unix/X11Helper.cpp b/stepmania/src/archutils/Unix/X11Helper.cpp
index abab70dc0c..5410b3fafe 100644
--- a/stepmania/src/archutils/Unix/X11Helper.cpp
+++ b/stepmania/src/archutils/Unix/X11Helper.cpp
@@ -11,7 +11,7 @@ Window X11Helper::Win = None;
 static int ErrorCallback( Display*, XErrorEvent* );
 static int FatalCallback( Display* );
 
-bool X11Helper::Go()
+bool X11Helper::OpenXConnection()
 {
 	if( g_iRefCount == 0 )
 	{
@@ -26,7 +26,7 @@ bool X11Helper::Go()
 	return true;
 }
 
-void X11Helper::Stop()
+void X11Helper::CloseXConnection()
 {
 	g_iRefCount--;
 
diff --git a/stepmania/src/archutils/Unix/X11Helper.h b/stepmania/src/archutils/Unix/X11Helper.h
index 8dc0f5441c..255abbb76f 100644
--- a/stepmania/src/archutils/Unix/X11Helper.h
+++ b/stepmania/src/archutils/Unix/X11Helper.h
@@ -10,14 +10,14 @@ namespace X11Helper
 
 	// Create the connection, if necessary; otherwise do some important
 	// internal session-tracking stuff (so you should call this anyway).
-	bool Go();
+	bool OpenXConnection();
 
 	// Destroy the connection, if appropriate; otherwise do some important
 	// internal session-tracking stuff (so you should call it anyway).
-	void Stop();
+	void CloseXConnection();
 
 	// The current Display (connection). Initialized by the first call to
-	// Go().
+	// OpenXConnection().
 	extern Display *Dpy;
 
 	// The Window used by LowLevelWindow_X11 as the main window.