From f5cdd2750871959edf47ced405ff20d4470143ef Mon Sep 17 00:00:00 2001
From: Rick van Vonderen <0945444@hr.nl>
Date: Wed, 18 Dec 2019 02:19:20 +0100
Subject: [PATCH] Code cleanup

---
 inferno/src/inferno/application.cpp          |  2 --
 inferno/src/inferno/application.h            |  2 +-
 inferno/src/inferno/core.h                   |  4 ++--
 inferno/src/inferno/entrypoint.h             |  3 +--
 inferno/src/inferno/event/applicationevent.h |  5 +++--
 inferno/src/inferno/event/event.h            |  2 +-
 inferno/src/inferno/log.cpp                  |  4 +++-
 inferno/src/inferno/log.h                    | 14 ++++++--------
 inferno/src/inferno/settings.cpp             |  4 ++--
 inferno/src/inferno/window.h                 |  2 +-
 10 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/inferno/src/inferno/application.cpp b/inferno/src/inferno/application.cpp
index 913e261..78f7544 100644
--- a/inferno/src/inferno/application.cpp
+++ b/inferno/src/inferno/application.cpp
@@ -1,5 +1,3 @@
-#include <memory> // unique_ptr
-
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>
 
diff --git a/inferno/src/inferno/application.h b/inferno/src/inferno/application.h
index 5647e6f..38f2231 100644
--- a/inferno/src/inferno/application.h
+++ b/inferno/src/inferno/application.h
@@ -1,7 +1,7 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-#include <memory> // unique_ptr
+#include <memory> // std::unique_ptr
 
 namespace Inferno {
 
diff --git a/inferno/src/inferno/core.h b/inferno/src/inferno/core.h
index f7b1cd2..f461726 100644
--- a/inferno/src/inferno/core.h
+++ b/inferno/src/inferno/core.h
@@ -1,8 +1,8 @@
 #ifndef CORE_H
 #define CORE_H
 
-#include <csignal> // raise
-#include <functional> // bind
+#include <csignal>    // raise
+#include <functional> // std::bind
 
 #define BIT(x) (1 << x)
 
diff --git a/inferno/src/inferno/entrypoint.h b/inferno/src/inferno/entrypoint.h
index 78982eb..203cc6e 100644
--- a/inferno/src/inferno/entrypoint.h
+++ b/inferno/src/inferno/entrypoint.h
@@ -17,8 +17,7 @@ int main(int argc, char* argv[])
 	(void)argv;
 
 	// Initialize Log
-	Inferno::Log::init();
-	NF_CORE_INFO("Initialized Log!");
+	Inferno::Log::initialize();
 
 	// Start application
 	auto app = Inferno::createApplication();
diff --git a/inferno/src/inferno/event/applicationevent.h b/inferno/src/inferno/event/applicationevent.h
index f87410b..33344c5 100644
--- a/inferno/src/inferno/event/applicationevent.h
+++ b/inferno/src/inferno/event/applicationevent.h
@@ -1,7 +1,7 @@
 #ifndef APPLICATIONEVENT_H
 #define APPLICATIONEVENT_H
 
-#include <sstream> // stringstream
+#include <sstream> // std::stringstream
 
 #include "inferno/event/event.h"
 
@@ -18,7 +18,8 @@ namespace Inferno {
 		WindowResizeEvent(int width, int height) :
 			m_width(width), m_height(height) {}
 
-		virtual std::string toString() const override {
+		virtual std::string toString() const override
+		{
 			std::stringstream ss;
 			ss << "WindowResize: " << m_width << "x" << m_height;
 			return ss.str();
diff --git a/inferno/src/inferno/event/event.h b/inferno/src/inferno/event/event.h
index dbc76d7..7168ed6 100644
--- a/inferno/src/inferno/event/event.h
+++ b/inferno/src/inferno/event/event.h
@@ -1,7 +1,7 @@
 #ifndef EVENT_H
 #define EVENT_H
 
-#include <ostream> // ostream
+#include <ostream> // std::ostream
 
 #include "inferno/core.h"
 
diff --git a/inferno/src/inferno/log.cpp b/inferno/src/inferno/log.cpp
index 1934727..24f5320 100644
--- a/inferno/src/inferno/log.cpp
+++ b/inferno/src/inferno/log.cpp
@@ -6,12 +6,14 @@ namespace Inferno {
 	std::shared_ptr<Logger> Log::m_coreLogger;
 	std::shared_ptr<Logger> Log::m_gameLogger;
 
-	void Log::init()
+	void Log::initialize()
 	{
 		// Create engine Logger
 		m_coreLogger = std::make_shared<Logger>("Inferno");
 		// Create game Logger
 		m_gameLogger = std::make_shared<Logger>("Game");
+
+		NF_CORE_INFO("Log initialized");
 	}
 
 	Logger::Logger(const char* name) :
diff --git a/inferno/src/inferno/log.h b/inferno/src/inferno/log.h
index 0e91a43..ed790ef 100644
--- a/inferno/src/inferno/log.h
+++ b/inferno/src/inferno/log.h
@@ -1,19 +1,18 @@
 #ifndef LOG_H
 #define LOG_H
 
-#include <cstdio> // sprintf, printf
+#include <cstdio>  // printf, sprintf
 #include <cstring> // strlen
-#include <memory> // shared_ptr
-#include <string> // string
+#include <memory>  // std::shared_ptr
+#include <string>  // std::string
 
 namespace Inferno {
 
 	class Logger;
 
-	class Log
-	{
+	class Log {
 	public:
-		static void init();
+		static void initialize();
 
 // -----------------------------------------
 
@@ -25,8 +24,7 @@ namespace Inferno {
 		static std::shared_ptr<Logger> m_gameLogger;
 	};
 
-	class Logger
-	{
+	class Logger {
 	public:
 		Logger(const char* name);
 		~Logger();
diff --git a/inferno/src/inferno/settings.cpp b/inferno/src/inferno/settings.cpp
index 0934919..9832786 100644
--- a/inferno/src/inferno/settings.cpp
+++ b/inferno/src/inferno/settings.cpp
@@ -1,6 +1,6 @@
 #include <fstream> // std::ifstream, std::ofstream
 #include <iomanip> // std::setfill, std::setw
-#include <string> // std::string
+#include <string>  // std::string
 
 #include "inferno/core.h"
 #include "inferno/log.h"
@@ -26,7 +26,7 @@ namespace Inferno {
 
 	void Settings::initialize()
 	{
-		nlohmann::json m_json = load();
+		nlohmann::json m_json = this->load();
 
 		try {
 			m_properties.title = m_json["window"]["title"].get<std::string>().c_str();
diff --git a/inferno/src/inferno/window.h b/inferno/src/inferno/window.h
index 54d4aec..3d36422 100644
--- a/inferno/src/inferno/window.h
+++ b/inferno/src/inferno/window.h
@@ -1,7 +1,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include <functional> // function
+#include <functional> // std::function
 
 class GLFWwindow;