From 5890d04f212e83bdc2e2305e006e6091471802fc Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 00:05:50 -0700
Subject: UI/CMakeLists.txt: Replaced glob with list of files

---
 src/UI/CMakeLists.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/UI')

diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt
index 5b5b8cc18..c41123318 100644
--- a/src/UI/CMakeLists.txt
+++ b/src/UI/CMakeLists.txt
@@ -4,9 +4,13 @@ project (MCServer)
 
 include_directories ("${PROJECT_SOURCE_DIR}/../")
 
-file(GLOB SOURCE
-    "*.cpp"
-    "*.h"
-)
+SET (SRCS
+	SlotArea.cpp
+	Window.cpp)
 
-add_library(UI ${SOURCE})
+SET (HDRS
+	SlotArea.h
+	Window.h
+	WindowOwner.h)
+
+add_library(UI ${SRCS} ${HDRS})
-- 
cgit v1.2.3


From 725d1fd1e2995b1720673c280fea1125ac338b3c Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 13:26:43 -0700
Subject: Subdirs: Only add_library if not using MSVC

---
 src/UI/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/UI')

diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt
index c41123318..2b094ef1d 100644
--- a/src/UI/CMakeLists.txt
+++ b/src/UI/CMakeLists.txt
@@ -13,4 +13,6 @@ SET (HDRS
 	Window.h
 	WindowOwner.h)
 
-add_library(UI ${SRCS} ${HDRS})
+if(NOT MSVC)
+	add_library(UI ${SRCS} ${HDRS})
+endif()
-- 
cgit v1.2.3


From 93d29555e58df172bafba530afbc593c16ec66a3 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 21 Jul 2014 15:19:48 +0200
Subject: Style: Normalized to no spaces before closing parenthesis.

---
 src/UI/Window.cpp | 4 ++--
 src/UI/Window.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/UI')

diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index 2558d15b8..2c22b41bd 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -319,9 +319,9 @@ void cWindow::OwnerDestroyed()
 	// Close window for each player. Note that the last one needs special handling
 	while (m_OpenedBy.size() > 1)
 	{
-		(*m_OpenedBy.begin() )->CloseWindow();
+		(*m_OpenedBy.begin())->CloseWindow();
 	}
-	(*m_OpenedBy.begin() )->CloseWindow();
+	(*m_OpenedBy.begin())->CloseWindow();
 }
 
 
diff --git a/src/UI/Window.h b/src/UI/Window.h
index 1872b2c20..97db0ca88 100644
--- a/src/UI/Window.h
+++ b/src/UI/Window.h
@@ -77,7 +77,7 @@ public:
 	int GetWindowType(void) const { return m_WindowType; }  // tolua_export
 
 	cWindowOwner * GetOwner(void) { return m_Owner; }
-	void SetOwner( cWindowOwner * a_Owner ) { m_Owner = a_Owner; }
+	void SetOwner( cWindowOwner * a_Owner) { m_Owner = a_Owner; }
 	
 	/// Returns the total number of slots
 	int GetNumSlots(void) const;
@@ -134,7 +134,7 @@ public:
 	// tolua_begin
 	
 	const AString & GetWindowTitle() const { return m_WindowTitle; }
-	void SetWindowTitle(const AString & a_WindowTitle ) { m_WindowTitle = a_WindowTitle; }
+	void SetWindowTitle(const AString & a_WindowTitle) { m_WindowTitle = a_WindowTitle; }
 	
 	/// Sends the UpdateWindowProperty (0x69) packet to all clients of the window
 	virtual void SetProperty(int a_Property, int a_Value);
-- 
cgit v1.2.3