Merge branch 'style2'

- Sort `#include`s
- Use `#pragma once` everywhere
- An `#include` fix

Author: mmatyas

es-app/src/FileData.cpp

@@ -1,7 +1,7 @@
 #include "FileData.h"
+#include "Settings.h"
 #include "SystemData.h"
 #include "SystemManager.h"
-#include "Settings.h"
 
 namespace fs = boost::filesystem;
 

es-app/src/FileData.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <vector>
-#include <string>
-#include <boost/filesystem.hpp>
 #include "MetaData.h"
+#include <boost/filesystem.hpp>
+#include <string>
+#include <vector>
 
 class SystemData;
 struct FileSort;

es-app/src/GamelistDB.cpp

@@ -1,10 +1,10 @@
 #include "GamelistDB.h"
-#include "MetaData.h"
 #include "Log.h"
+#include "MetaData.h"
 #include "SystemData.h"
-#include <sstream>
-#include <map>
 #include <boost/assign.hpp>
+#include <map>
+#include <sstream>
 
 namespace fs = boost::filesystem;
 

es-app/src/GamelistDB.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "ESException.h"
-#include "MetaData.h"
 #include "FileData.h"
-#include <string>
+#include "MetaData.h"
 #include <sqlite3/sqlite3.h>
+#include <string>
 
 class SystemData;
 

es-app/src/MetaData.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "pugixml/pugixml.hpp"
-#include <string>
-#include <map>
 #include "GuiComponent.h"
 #include "Util.h"
+#include "pugixml/pugixml.hpp"
 #include <boost/date_time.hpp>
 #include <boost/filesystem.hpp>
+#include <map>
+#include <string>
 
 enum MetaDataType
 {

es-app/src/SystemData.cpp

@@ -1,15 +1,15 @@
 #include "SystemData.h"
-#include <boost/filesystem.hpp>
-#include <fstream>
-#include <stdlib.h>
-#include <SDL_joystick.h>
-#include "Renderer.h"
 #include "AudioManager.h"
-#include "VolumeControl.h"
-#include "Log.h"
 #include "InputManager.h"
-#include <iostream>
+#include "Log.h"
+#include "Renderer.h"
 #include "Settings.h"
+#include "VolumeControl.h"
+#include <SDL_joystick.h>
+#include <boost/filesystem.hpp>
+#include <fstream>
+#include <iostream>
+#include <stdlib.h>
 
 namespace fs = boost::filesystem;
 

es-app/src/SystemData.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include <vector>
-#include <string>
 #include "FileData.h"
-#include "Window.h"
 #include "MetaData.h"
 #include "PlatformId.h"
 #include "ThemeData.h"
+#include "Window.h"
+#include <string>
+#include <vector>
 
 class SystemData
 {

es-app/src/SystemManager.cpp

@@ -1,11 +1,11 @@
 #include "SystemManager.h"
-#include "Log.h"
 #include "ESException.h"
+#include "Log.h"
+#include "Settings.h"
 #include "SystemData.h"
+#include "views/ViewController.h"
 #include <fstream>
 #include <pugixml/pugixml.hpp>
-#include "Settings.h"
-#include "views/ViewController.h"
 
 namespace fs = boost::filesystem;
 

es-app/src/VolumeControl.h

@@ -3,8 +3,8 @@
 #include <memory>
 #include <stdint.h>
 
-#if defined (__APPLE__)
-    #warning TODO: Not implemented for MacOS yet!!!
+#if defined(__APPLE__)
+	#warning TODO: Not implemented for MacOS yet!!!
 #elif defined(__linux__)
 	#include <unistd.h>
 	#include <fcntl.h>

es-app/src/components/RatingComponent.cpp

@@ -1,7 +1,7 @@
 #include "components/RatingComponent.h"
 #include "Renderer.h"
-#include "Window.h"
 #include "Util.h"
+#include "Window.h"
 #include "resources/SVGResource.h"
 
 RatingComponent::RatingComponent(Window* window) : GuiComponent(window)