From bf563f92f3e293881ba500040bc5c670841324c2 Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Mon, 21 Jul 2014 13:25:18 +0200
Subject: [PATCH] logic: moved font and logger initialization into init() in
 main

---
 src/app/main.cpp        | 13 +++++++++++--
 src/lib/Application.cpp |  5 -----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index bf5859fd..f0fc7c5f 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -6,6 +6,15 @@
 #include "includes.h" // defines 'void setup()'
 #include "qt/QtGuiFactory.h"
 #include "qt/utility/utilityQt.h"
+#include "utility/logging/ConsoleLogger.h"
+#include "utility/logging/LogManager.h"
+
+void init()
+{
+	LogManager::getInstance()->addLogger(std::make_shared<ConsoleLogger>());
+
+	utility::loadFontsFromDirectory("data/fonts", ".otf");
+}
 
 int main(int argc, char *argv[])
 {
@@ -14,10 +23,10 @@ int main(int argc, char *argv[])
 	QApplication qtApp(argc, argv);
 	QtGuiFactory guiFactory;
 
+	init();
+
 	std::shared_ptr<Application> app = Application::create(&guiFactory);
 	app->loadProject("data/ProjectSettings.xml");
 
-	utility::loadFontsFromDirectory("data/fonts", ".otf");
-
 	return qtApp.exec();
 }
diff --git a/src/lib/Application.cpp b/src/lib/Application.cpp
index d8b94a55..19215a3a 100644
--- a/src/lib/Application.cpp
+++ b/src/lib/Application.cpp
@@ -5,16 +5,11 @@
 #include "data/access/GraphAccessProxy.h"
 #include "data/access/LocationAccessProxy.h"
 #include "gui/GuiFactory.h"
-#include "utility/logging/ConsoleLogger.h"
-#include "utility/logging/LogManager.h"
 #include "utility/messaging/MessageQueue.h"
 #include "utility/messaging/type/MessageActivateToken.h"
 
 std::shared_ptr<Application> Application::create(GuiFactory* guiFactory)
 {
-	std::shared_ptr<ConsoleLogger> consoleLogger = std::make_shared<ConsoleLogger>(); // TODO: move to main
-	LogManager::getInstance()->addLogger(consoleLogger);
-
 	ApplicationSettings::getInstance()->load("data/ApplicationSettings.xml");
 
 	std::shared_ptr<Application> ptr(new Application());