From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 18 Aug 2009 09:24:15 +0000
Subject: astyle cleanup, corrects not loading of material textures

---
 src/ui/palette.h | 81 ++++++++++++++++++++++++--------------------------------
 1 file changed, 34 insertions(+), 47 deletions(-)

(limited to 'src/ui/palette.h')

diff --git a/src/ui/palette.h b/src/ui/palette.h
index 61a0b72..422c0e7 100644
--- a/src/ui/palette.h
+++ b/src/ui/palette.h
@@ -22,94 +22,81 @@ public:
 
 	/// default destructor
 	~Palette();
-	
+
 	/// color index
-	enum Color { Foreground=0, Background=1, Border=2, Text=3, Highlight=4, Disabled=5, Pointer=6, Active=7,
-			Debug=8, Mission=9, Bold=10, Fancy=11, Warning=12, Error=13 };
+	enum Color { Foreground = 0, Background = 1, Border = 2, Text = 3, Highlight = 4, Disabled = 5, Pointer = 6, Active = 7,
+		     Debug = 8, Mission = 9, Bold = 10, Fancy = 11, Warning = 12, Error = 13
+		   };
 
 	/* ---- mutators ------------------------------------------- */
 
 	/// set foreground color
-	inline void set_foreground(const math::Color &color)
-	{
+	inline void set_foreground(const math::Color &color) {
 		palette_foreground.assign(color);
 	}
-	
+
 	/// set background color
-	inline void set_background(const math::Color &color)
-	{
+	inline void set_background(const math::Color &color) {
 		palette_background.assign(color);
 	}
-	
+
 	/// set border color
-	inline void set_border(const math::Color &color)
-	{
+	inline void set_border(const math::Color &color) {
 		palette_border.assign(color);
 	}
-	
+
 	/// set text color
-	inline void set_text(const math::Color &color)
-	{
+	inline void set_text(const math::Color &color) {
 		palette_text.assign(color);
 	}
-	
+
 	/// set highlight color
-	inline void set_highlight(const math::Color &color)
-	{
+	inline void set_highlight(const math::Color &color) {
 		palette_highlight.assign(color);
 	}
-	
+
 	/// set disabled color
-	inline void set_disabled(const math::Color &color)
-	{
+	inline void set_disabled(const math::Color &color) {
 		palette_disabled.assign(color);
 	}
 
 	/// set pointer color
-	inline void set_pointer(const math::Color &color)
-	{
+	inline void set_pointer(const math::Color &color) {
 		palette_pointer.assign(color);
 	}
-	
+
 	/// set active pointer color
-	inline void set_active(const math::Color &color)
-	{
+	inline void set_active(const math::Color &color) {
 		palette_active.assign(color);
 	}
-	
+
 	/// set debug color
-	inline void set_debug(const math::Color &color)
-	{
+	inline void set_debug(const math::Color &color) {
 		palette_debug.assign(color);
 	}
-	
+
 	/// set mission color
-	inline void set_mission(const math::Color &color)
-	{
+	inline void set_mission(const math::Color &color) {
 		palette_mission.assign(color);
 	}
 
 	/// set bold text color
-	inline void set_bold(const math::Color &color)
-	{
+	inline void set_bold(const math::Color &color) {
 		palette_bold.assign(color);
 	}
-	
+
 	/// set fancy text color
-	inline void set_fancy(const math::Color &color)
-	{
+	inline void set_fancy(const math::Color &color) {
 		palette_fancy.assign(color);
 	}
-	
+
 	/// set warning text color
-	inline void set_warning(const math::Color &color)
-	{
+	inline void set_warning(const math::Color &color) {
 		palette_warning.assign(color);
 	}
 
 	/// set error text color
-	inline void set_error(const math::Color &color)
-	{
+	inline void set_error(const math::Color &color) {
 		palette_error.assign(color);
 	}
 
@@ -119,17 +106,17 @@ public:
 	inline const math::Color &foreground() const {
 		return palette_foreground;
 	}
-	
+
 	/// background color
 	inline const math::Color &background() const {
 		return palette_background;
 	}
-	
+
 	/// border color
 	inline const math::Color &border() const {
 		return palette_border;
 	}
-		
+
 	/// text color
 	inline const math::Color &text() const {
 		return palette_text;
@@ -149,7 +136,7 @@ public:
 	inline const math::Color &pointer() const {
 		return palette_pointer;
 	}
-	
+
 	/// active pointer color
 	inline const math::Color &active() const {
 		return palette_active;
@@ -187,7 +174,7 @@ public:
 
 	// indexed color
 	const math::Color &color(Palette::Color palettecolor) const;
-	
+
 private:
 	// UI colors
 	math::Color	palette_foreground;
@@ -199,7 +186,7 @@ private:
 	math::Color	palette_pointer;
 	math::Color	palette_active;
 	math::Color	palette_debug;
-	
+
 	// HUD colors
 	math::Color	palette_mission;
 
-- 
cgit v1.2.3