From 8bc51bee4ce16e63524fc638188634d6d73f756c Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Fri, 6 Apr 2012 20:04:26 -0500
Subject: [PATCH] glife: Initial style cleanup

---
 src/add-ons/screen_savers/glife/GLifeConfig.cpp | 3 ++-
 src/add-ons/screen_savers/glife/GLifeConfig.h   | 1 +
 src/add-ons/screen_savers/glife/GLifeGrid.cpp   | 8 ++++++--
 src/add-ons/screen_savers/glife/GLifeGrid.h     | 4 ++++
 src/add-ons/screen_savers/glife/GLifeSaver.cpp  | 1 +
 src/add-ons/screen_savers/glife/GLifeState.h    | 1 +
 src/add-ons/screen_savers/glife/GLifeView.cpp   | 4 ++++
 src/add-ons/screen_savers/glife/GLifeView.h     | 1 +
 8 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/add-ons/screen_savers/glife/GLifeConfig.cpp b/src/add-ons/screen_savers/glife/GLifeConfig.cpp
index 5b5738afab..8b9336d358 100644
--- a/src/add-ons/screen_savers/glife/GLifeConfig.cpp
+++ b/src/add-ons/screen_savers/glife/GLifeConfig.cpp
@@ -7,13 +7,14 @@
  */
 
 
+#include "GLifeConfig.h"
+
 #include <stdio.h>
 #include <Slider.h>
 #include <StringView.h>
 #include <View.h>
 
 #include "GLifeState.h"
-#include "GLifeConfig.h"
 
 
 // ------------------------------------------------------
diff --git a/src/add-ons/screen_savers/glife/GLifeConfig.h b/src/add-ons/screen_savers/glife/GLifeConfig.h
index 907d5d9269..9c62b9e587 100644
--- a/src/add-ons/screen_savers/glife/GLifeConfig.h
+++ b/src/add-ons/screen_savers/glife/GLifeConfig.h
@@ -42,4 +42,5 @@ public:
 	void		MessageReceived( BMessage* );
 };
 
+
 #endif /* _GLIFE_GLIFECONFIG_H */
diff --git a/src/add-ons/screen_savers/glife/GLifeGrid.cpp b/src/add-ons/screen_savers/glife/GLifeGrid.cpp
index e2c5a25c9f..9e7c77aca7 100644
--- a/src/add-ons/screen_savers/glife/GLifeGrid.cpp
+++ b/src/add-ons/screen_savers/glife/GLifeGrid.cpp
@@ -7,12 +7,12 @@
  */
 
 
+#include "GLifeGrid.h"
+
 #include <math.h>
 #include <stdlib.h>
 #include <SupportDefs.h>
 
-#include "GLifeGrid.h"
-
 
 // ------------------------------------------------------
 //  GLifeGrid Class Neighbors Definition
@@ -28,6 +28,7 @@ inline int32 GLifeGrid::Neighbors( int32 iRow, int32 iColumn )
 		   ( Occupied( iRow + 1, iColumn + 1 ) ? 1 : 0 );
 }
 
+
 // ------------------------------------------------------
 //  GLifeGrid Class Constructor Definition
 GLifeGrid::GLifeGrid( int32 iWidth, int32 iHeight )
@@ -46,6 +47,7 @@ GLifeGrid::GLifeGrid( int32 iWidth, int32 iHeight )
 	}
 }
 
+
 // ------------------------------------------------------
 //  GLifeGrid Class Destructor Definition
 GLifeGrid::~GLifeGrid( void )
@@ -53,6 +55,7 @@ GLifeGrid::~GLifeGrid( void )
 	delete m_pbGrid;
 }
 
+
 // ------------------------------------------------------
 //  GLifeGrid Class Generation Definition
 void GLifeGrid::Generation( void )
@@ -75,6 +78,7 @@ void GLifeGrid::Generation( void )
 	m_pbGrid = pbTemp;
 }
 
+
 // ------------------------------------------------------
 //  GLifeGrid Class Occupied Definition
 bool GLifeGrid::Occupied( int32 iRow, int32 iColumn )
diff --git a/src/add-ons/screen_savers/glife/GLifeGrid.h b/src/add-ons/screen_savers/glife/GLifeGrid.h
index ab199aee40..7068486d29 100644
--- a/src/add-ons/screen_savers/glife/GLifeGrid.h
+++ b/src/add-ons/screen_savers/glife/GLifeGrid.h
@@ -9,6 +9,9 @@
 #define _GLIFE_GLIFEGRID_H
 
 
+#include <OS.h>
+
+
 // GLifeGrid Class Declaration
 class GLifeGrid
 {
@@ -29,4 +32,5 @@ public:
 	bool		Occupied( int32, int32 );
 };
 
+
 #endif /* _GLIFE_GLIFEGRID_H */
diff --git a/src/add-ons/screen_savers/glife/GLifeSaver.cpp b/src/add-ons/screen_savers/glife/GLifeSaver.cpp
index a954835aae..9574893851 100644
--- a/src/add-ons/screen_savers/glife/GLifeSaver.cpp
+++ b/src/add-ons/screen_savers/glife/GLifeSaver.cpp
@@ -4,6 +4,7 @@
  *
  * Authors:
  * 		Aaron Hill <serac@hillvisions.com>
+ *		Alexander von Gluck <kallisti5@unixzen.com>
  */
  
 
diff --git a/src/add-ons/screen_savers/glife/GLifeState.h b/src/add-ons/screen_savers/glife/GLifeState.h
index 9d459d2da4..8e3e0db953 100644
--- a/src/add-ons/screen_savers/glife/GLifeState.h
+++ b/src/add-ons/screen_savers/glife/GLifeState.h
@@ -14,6 +14,7 @@ const int32 c_iDefGridWidth = 60;
 const int32 c_iDefGridHeight = 40;
 const int32 c_iDefBorder = 0;
 
+
 // GLifeState Class Declaration & Definition
 class GLifeState
 {
diff --git a/src/add-ons/screen_savers/glife/GLifeView.cpp b/src/add-ons/screen_savers/glife/GLifeView.cpp
index e91b341508..b45009431d 100644
--- a/src/add-ons/screen_savers/glife/GLifeView.cpp
+++ b/src/add-ons/screen_savers/glife/GLifeView.cpp
@@ -50,6 +50,7 @@ GLifeView::GLifeView(BRect rect, const char* name, ulong resizingMode,
 	UnlockGL();
 }
 
+
 // ------------------------------------------------------
 //  GLifeView Class Destructor Definition
 GLifeView::~GLifeView( void )
@@ -57,6 +58,7 @@ GLifeView::~GLifeView( void )
 	delete m_pglgGrid;
 }
 
+
 // ------------------------------------------------------
 //  GLifeView Class AttachedToWindow Definition
 void GLifeView::AttachedToWindow( void )
@@ -66,6 +68,7 @@ void GLifeView::AttachedToWindow( void )
 	UnlockGL();
 }
 
+
 // ------------------------------------------------------
 //  GLifeView Class Draw Definition
 void GLifeView::Draw(BRect updateRect)
@@ -164,6 +167,7 @@ void GLifeView::Draw(BRect updateRect)
 	glPopMatrix();
 }
 
+
 // ------------------------------------------------------
 //  GLifeView Class Advance Definition
 void GLifeView::Advance( void )
diff --git a/src/add-ons/screen_savers/glife/GLifeView.h b/src/add-ons/screen_savers/glife/GLifeView.h
index 64b516f742..3458e6d5a6 100644
--- a/src/add-ons/screen_savers/glife/GLifeView.h
+++ b/src/add-ons/screen_savers/glife/GLifeView.h
@@ -33,4 +33,5 @@ private:
 			int32		m_iStep;
 };
 
+
 #endif /* _GLIFE_GLIFEVIEW_H */