Styleguide conformance

Author: LB--

src/AppState.h renamed to src/AppState.hpp

@@ -1,12 +1,12 @@
 #ifndef _APPSTATE_H
 #define _APPSTATE_H
 
-#include "SFMLEvent.h"
+#include "SFMLEvent.hpp"
 #include <SFML/Graphics.hpp>
 
 namespace chesspp
 {
-    //pure virtual abstract base class for game state management. 
+    //pure virtual abstract base class for game state management.
     class AppState : public SFMLEvent
     {
     public:
@@ -18,10 +18,10 @@ namespace chesspp
 
     protected:
         sf::RenderWindow *display;
-    }; 
+    };
 }
 
-#include "AppStateGame.h"
+#include "AppStateGame.hpp"
 /* Convenience header inclusion so we don't have to include each individual inheritor */
 
-#endif
+#endif

src/AppStateGame.cpp

@@ -1,4 +1,4 @@
-#include "AppState.h"
+#include "AppState.hpp"
 
 namespace chesspp
 {
@@ -9,7 +9,7 @@ namespace chesspp
     }
 
     int AppStateGame::id() { return 1; }
-	
+
     void AppStateGame::OnRender()
     {
         graphics.drawBoard(board);
@@ -18,7 +18,7 @@ namespace chesspp
     void AppStateGame::OnLButtonPressed(int x, int y)
     {
         board->setSelected(board->getCurrent()); // No matter if NULL
-    } 
+    }
     void AppStateGame::OnMouseMoved(int x, int y)
     {
         board->setCurrent(x,y);
@@ -29,4 +29,4 @@ namespace chesspp
         board->move(board->getSelected(), x, y);
         board->setSelected(NULL);
     }
-}
+}

src/AppStateGame.h renamed to src/AppStateGame.hpp

@@ -1,38 +1,38 @@
 #ifndef _APPSTATEGAME_H
-	#define _APPSTATEGAME_H
+    #define _APPSTATEGAME_H
 #include "SFML.hpp"
-#include "TextureManager.h"
-#include "Graphics.h"
-#include "Configuration.h"
-#include "board/Board.h"
+#include "TextureManager.hpp"
+#include "Graphics.hpp"
+#include "Configuration.hpp"
+#include "board/Board.hpp"
 
 #ifdef _DEBUG
-	#include <iostream>
-	using std::cout; using std::cin; using std::endl;
+    #include <iostream>
+    using std::cout; using std::cin; using std::endl;
 #endif
 
 namespace chesspp
 {
     class Application;
     class AppStateGame : public AppState
     {
-	    Application* app;
+        Application* app;
         Board* board;
 
         graphics::GraphicsHandler graphics;
         configuration::BoardConfig boardConfig;
-	    
+
     public:
         AppStateGame(Application* _app, sf::RenderWindow *_display);
         virtual ~AppStateGame() {}
-        
+
         virtual int id();
         virtual void OnRender();
 
         virtual void OnLButtonPressed(int x, int y);
         virtual void OnLButtonReleased(int x, int y);
         virtual void OnMouseMoved(int x, int y);
-    }; 
+    };
 }
 
-#endif
+#endif

src/Application.cpp

@@ -1,12 +1,12 @@
-#include "Application.h"
+#include "Application.hpp"
 #include <iostream>
 
 namespace chesspp
 {
     Application::Application()
-    :  	display(sf::VideoMode(640, 640), "ChessPlusPlus", sf::Style::Close),
-	    running(true),
-	    state(new AppStateGame(this, &display))
+    :   display(sf::VideoMode(640, 640), "ChessPlusPlus", sf::Style::Close),
+        running(true),
+        state(new AppStateGame(this, &display))
     {
         display.setVerticalSyncEnabled(true);
     }
@@ -20,16 +20,16 @@ namespace chesspp
                 OnEvent(&Event);
 
             state->OnRender();
-	        display.display();
+            display.display();
         }
-   
+
         return 0;
     }
 
     Application::~Application()
     {
-	    delete state; //Even if it's null, no matter.
-    } 
+        delete state; //Even if it's null, no matter.
+    }
 
     void Application::OnEvent(sf::Event *Event)
     {
@@ -175,4 +175,4 @@ namespace chesspp
         }
     }
 
-}
+}

src/Application.h renamed to src/Application.hpp

@@ -1,7 +1,7 @@
 #ifndef _APPLICATION_H
-	#define _APPLICATION_H
+    #define _APPLICATION_H
 
-#include "AppState.h"
+#include "AppState.hpp"
 
 namespace chesspp
 {
@@ -10,9 +10,9 @@ namespace chesspp
         sf::RenderWindow display;
         bool running;
         AppState* state;
-	    void OnEvent(sf::Event *Event);
+        void OnEvent(sf::Event *Event);
 
-    public:  
+    public:
         Application();
         ~Application();
 
@@ -22,7 +22,7 @@ namespace chesspp
             state = new NewState;
         }
         int Exec();
-    }; 
+    };
 }
 
-#endif
+#endif

src/Configuration.h renamed to src/Configuration.hpp

@@ -1,8 +1,8 @@
 #ifndef _CONFIGURATION_H
 #define _CONFIGURATION_H
 
-#include <string.h>
-#include <stdint.h>
+#include <cstring>
+#include <cstdint>
 #include <boost/algorithm/string/replace.hpp>
 
 #if defined(__linux__)
@@ -14,9 +14,9 @@
 #endif
 
 
-#include "Exception.h"
-#include "XMLReader.h"
-#include "board/logger.h"
+#include "Exception.hpp"
+#include "XMLReader.hpp"
+#include "board/logger.hpp"
 
 namespace chesspp
 {
@@ -26,7 +26,7 @@ namespace chesspp
         {
         protected:
             std::string res_path;
-            
+
             //Linux and Windows, resource path is defined as the absolute path the folder where the application executable is stored.
             //    <exe_location>/res/img/... should be where resources are stored.
             //OS x, resource path is defined as the absolute path to the Resources folder of the .app structure.
@@ -49,7 +49,7 @@ namespace chesspp
                      ret = buf;
                      boost::replace_all(ret, "\\", "/");
                      ret = ret.substr(0, ret.find_last_of('/')+1);
-                
+
                 #elif defined(__APPLE__)
                      if (_NSGetExecutablePath(buf, &size) != 0)
                          throw chesspp::exception("Unable to determine executable path on OS x. (Buffer size too small?)");
@@ -60,7 +60,7 @@ namespace chesspp
 
                 #else
                       throw chesspp::exception("Unknown OS. Unable to determine executable path.");
-                #endif	
+                #endif
 
                 return ret;
             }
@@ -69,7 +69,7 @@ namespace chesspp
         public:
             configuration(const std::string &configFile) : res_path(getResourcePath()), reader(getResourcePath() + configFile) {}
             virtual ~configuration() {}
-            
+
         };
 
         class BoardConfig : public configuration
@@ -79,15 +79,15 @@ namespace chesspp
             uint16_t cell_width, cell_height;
 
         public:
-            BoardConfig() : configuration("config.xml") 
+            BoardConfig() : configuration("config.xml")
             {
                 initial_layout = res_path + reader.getProperty<std::string>("chesspp.data.board.initial_layout");
                 board_width = reader.getProperty<uint8_t>("chesspp.data.board.width");
                 board_height = reader.getProperty<uint8_t>("chesspp.data.board.height");
                 cell_width = reader.getProperty<uint16_t>("chesspp.data.board.cell_width");
                 cell_height = reader.getProperty<uint16_t>("chesspp.data.board.cell_height");
             }
-            
+
             std::string getInitialLayout() { return initial_layout; }
             uint8_t     getBoardWidth() { return board_width; }
             uint8_t     getBoardHeight() { return board_height; }
@@ -111,7 +111,7 @@ namespace chesspp
             std::string getSpritePath_pieces() { return path_pieces; }
             std::string getSpritePath_validMove() { return path_validMove; }
         };
-    } 
+    }
 }
 
-#endif
+#endif

src/Exception.h renamed to src/Exception.hpp

@@ -16,10 +16,10 @@ namespace chesspp
 
         exception(const std::string &_e) throw() : e(_e) {}
         virtual const char *what() { return e.c_str(); }
-        
+
     private:
         std::string e;
     };
 }
 
-#endif
+#endif

src/Graphics.cpp

@@ -1,4 +1,4 @@
-#include "Graphics.h"
+#include "Graphics.hpp"
 
 namespace chesspp
 {
@@ -85,4 +85,4 @@ namespace chesspp
                 drawPieceAt(b->getSelected(), sf::Mouse::getPosition(*display));
         }
     }
-}
+}

src/Graphics.h renamed to src/Graphics.hpp

@@ -2,10 +2,10 @@
 #define _GRAPHICS_H
 
 #include "SFML.hpp"
-#include "TextureManager.h"
-#include "Configuration.h"
-#include "board/Piece.h"
-#include "board/logger.h"
+#include "TextureManager.hpp"
+#include "Configuration.hpp"
+#include "board/Piece.hpp"
+#include "board/logger.hpp"
 
 #ifdef _DEBUG
 #include <iostream>
@@ -21,7 +21,7 @@ namespace chesspp
             sf::Sprite board, pieces, validMove;
             uint16_t cell_size;
             sf::RenderWindow *display;
-        
+
         public:
             GraphicsHandler(sf::RenderWindow *_display);
 
@@ -46,4 +46,4 @@ namespace chesspp
     }
 }
 
-#endif
+#endif

src/Main.cpp

@@ -1,7 +1,7 @@
-#include "Application.h"
+#include "Application.hpp"
 
 int main()
 {
-	chesspp::Application app;
-	return app.Exec();
-}
+    chesspp::Application app;
+    return app.Exec();
+}

src/README.md

@@ -4,12 +4,15 @@ Style Guide & Coding Conventions
 - All files are to have a single blank line at their end, if possible.
 - Prefer C++11 features to C++03 features when possible, and avoid deprecated language features.
 - When using C++11 features, try to use those which are supported by at least both clang++ and gcc
+- Prefer to use `<c____>` rather than `<____.h>` for C standard library headers
 - Prefer use of `class` to `struct` for declaring classes (this means you need to explicitly specify public inheritance).
 - Prefer to use file extensions .cpp and .hpp (using .h may cause the file to be detected as C or Objective-C rather than C++)
 - Prefer `lowercase` namespace, parameter, and local variable names.
 - Prefer `UpperCamelCase` for class names
 - Prefer `lowerCamelCase` for member function names
 - Prefer `lower_case_underscore` private member names
+- Braces should be on their own lines, even for empty definitions
+- Namespaces cause indentation to occur, inclusion guards do not
 - Avoid using raw pointers when possible
 - Prefer creating `using` declarations to using raw primitive types
 - Avoid use of exceptions when possible