From b0c19ef2c5e97bd5fec2ac3a30dd818532747dcb Mon Sep 17 00:00:00 2001
From: Alex Szpakowski <slime73@gmail.com>
Date: Tue, 24 Nov 2015 22:35:57 -0400
Subject: [PATCH] Renamed love.window.set/isScreenSaverEnabled to
 love.window.set/isDisplaySleepEnabled.

---
 license.txt                                  |  4 ++--
 src/modules/filesystem/physfs/Filesystem.cpp |  2 +-
 src/modules/window/Window.h                  |  4 ++--
 src/modules/window/sdl/Window.cpp            |  6 +++---
 src/modules/window/sdl/Window.h              |  4 ++--
 src/modules/window/wrap_Window.cpp           | 12 ++++++------
 src/modules/window/wrap_Window.h             |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/license.txt b/license.txt
index 322fc60ed..08c189b61 100644
--- a/license.txt
+++ b/license.txt
@@ -1,6 +1,6 @@
-This software uses LÖVE:
+This software uses LOVE:
 
-LÖVE is Copyright (c) 2006-2015 LOVE Development Team
+LOVE is Copyright (c) 2006-2015 LOVE Development Team
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff --git a/src/modules/filesystem/physfs/Filesystem.cpp b/src/modules/filesystem/physfs/Filesystem.cpp
index fe2a563d4..bf5f09e85 100644
--- a/src/modules/filesystem/physfs/Filesystem.cpp
+++ b/src/modules/filesystem/physfs/Filesystem.cpp
@@ -219,7 +219,7 @@ bool Filesystem::setSource(const char *source)
 	std::string new_search_path = source;
 
 #ifdef LOVE_ANDROID
-	if (!love::android::createStorageDirectories ())
+	if (!love::android::createStorageDirectories())
 		SDL_Log("Error creating storage directories!");
 
 	char* game_archive_ptr = NULL;
diff --git a/src/modules/window/Window.h b/src/modules/window/Window.h
index 3240bba37..e06866337 100644
--- a/src/modules/window/Window.h
+++ b/src/modules/window/Window.h
@@ -137,8 +137,8 @@ public:
 	virtual bool setIcon(love::image::ImageData *imgd) = 0;
 	virtual love::image::ImageData *getIcon() = 0;
 
-	virtual void setScreenSaverEnabled(bool enable) = 0;
-	virtual bool isScreenSaverEnabled() const = 0;
+	virtual void setDisplaySleepEnabled(bool enable) = 0;
+	virtual bool isDisplaySleepEnabled() const = 0;
 
 	virtual void minimize() = 0;
 	virtual void maximize() = 0;
diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp
index d86f33f8e..25fdc9b4e 100644
--- a/src/modules/window/sdl/Window.cpp
+++ b/src/modules/window/sdl/Window.cpp
@@ -68,7 +68,7 @@ Window::Window()
 		throw love::Exception("Could not initialize SDL video subsystem (%s)", SDL_GetError());
 
 	// Make sure the screensaver doesn't activate by default.
-	setScreenSaverEnabled(false);
+	setDisplaySleepEnabled(false);
 
 	SDL_version version = {};
 	SDL_GetVersion(&version);
@@ -845,7 +845,7 @@ love::image::ImageData *Window::getIcon()
 	return curMode.icon.get();
 }
 
-void Window::setScreenSaverEnabled(bool enable)
+void Window::setDisplaySleepEnabled(bool enable)
 {
 	if (enable)
 		SDL_EnableScreenSaver();
@@ -853,7 +853,7 @@ void Window::setScreenSaverEnabled(bool enable)
 		SDL_DisableScreenSaver();
 }
 
-bool Window::isScreenSaverEnabled() const
+bool Window::isDisplaySleepEnabled() const
 {
 	return SDL_IsScreenSaverEnabled() != SDL_FALSE;
 }
diff --git a/src/modules/window/sdl/Window.h b/src/modules/window/sdl/Window.h
index 56ad1cf4a..6eaf2a758 100644
--- a/src/modules/window/sdl/Window.h
+++ b/src/modules/window/sdl/Window.h
@@ -70,8 +70,8 @@ public:
 	bool setIcon(love::image::ImageData *imgd);
 	love::image::ImageData *getIcon();
 
-	void setScreenSaverEnabled(bool enable);
-	bool isScreenSaverEnabled() const;
+	void setDisplaySleepEnabled(bool enable);
+	bool isDisplaySleepEnabled() const;
 
 	void minimize();
 	void maximize();
diff --git a/src/modules/window/wrap_Window.cpp b/src/modules/window/wrap_Window.cpp
index ec3ecd240..bb0ea74c4 100644
--- a/src/modules/window/wrap_Window.cpp
+++ b/src/modules/window/wrap_Window.cpp
@@ -329,15 +329,15 @@ int w_getIcon(lua_State *L)
 	return 1;
 }
 
-int w_setScreenSaverEnabled(lua_State *L)
+int w_setDisplaySleepEnabled(lua_State *L)
 {
-	instance()->setScreenSaverEnabled(luax_toboolean(L, 1));
+	instance()->setDisplaySleepEnabled(luax_toboolean(L, 1));
 	return 0;
 }
 
-int w_isScreenSaverEnabled(lua_State *L)
+int w_isDisplaySleepEnabled(lua_State *L)
 {
-	luax_pushboolean(L, instance()->isScreenSaverEnabled());
+	luax_pushboolean(L, instance()->isDisplaySleepEnabled());
 	return 1;
 }
 
@@ -521,8 +521,8 @@ static const luaL_Reg functions[] =
 	{ "getPosition", w_getPosition },
 	{ "setIcon", w_setIcon },
 	{ "getIcon", w_getIcon },
-	{ "setScreenSaverEnabled", w_setScreenSaverEnabled },
-	{ "isScreenSaverEnabled", w_isScreenSaverEnabled },
+	{ "setDisplaySleepEnabled", w_setDisplaySleepEnabled },
+	{ "isDisplaySleepEnabled", w_isDisplaySleepEnabled },
 	{ "setTitle", w_setTitle },
 	{ "getTitle", w_getTitle },
 	{ "hasFocus", w_hasFocus },
diff --git a/src/modules/window/wrap_Window.h b/src/modules/window/wrap_Window.h
index fa0e0911a..361184ca3 100644
--- a/src/modules/window/wrap_Window.h
+++ b/src/modules/window/wrap_Window.h
@@ -43,8 +43,8 @@ int w_setPosition(lua_State *L);
 int w_getPosition(lua_State *L);
 int w_setIcon(lua_State *L);
 int w_getIcon(lua_State *L);
-int w_setScreenSaverEnabled(lua_State *L);
-int w_isScreenSaverEnabled(lua_State *L);
+int w_setDisplaySleepEnabled(lua_State *L);
+int w_isDisplaySleepEnabled(lua_State *L);
 int w_setTitle(lua_State *L);
 int w_getTitle(lua_State *L);
 int w_hasFocus(lua_State *L);