From a49d889ee87f370d7be31af745782e2a49233fe6 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Fri, 28 Dec 2018 19:58:12 +0100
Subject: [PATCH] Move easylogging++ include into necessary files

logging.h previously had logic to enable debug logging even on release
builds. This logic was moved to the QMAKE file, hence the logging.h file
is no longer necessary.
---
 advancedSettings.pro                                      | 1 -
 src/logging.h                                             | 4 ----
 src/main.cpp                                              | 2 +-
 src/overlaycontroller.cpp                                 | 2 +-
 src/overlaycontroller.h                                   | 2 +-
 src/tabcontrollers/audiomanager/AudioManagerWindows.cpp   | 2 +-
 src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp | 2 +-
 7 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 src/logging.h

diff --git a/advancedSettings.pro b/advancedSettings.pro
index 9f1970a..4590bb8 100644
--- a/advancedSettings.pro
+++ b/advancedSettings.pro
@@ -56,7 +56,6 @@ SOURCES += src/main.cpp\
     src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp
 
 HEADERS += src/overlaycontroller.h \
-    src/logging.h \
     src/tabcontrollers/AudioTabController.h \
     src/tabcontrollers/ChaperoneTabController.h \
     src/tabcontrollers/FixFloorTabController.h \
diff --git a/src/logging.h b/src/logging.h
deleted file mode 100644
index 486f02d..0000000
--- a/src/logging.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-// easylogging includes
-#include <easylogging++.h>
diff --git a/src/main.cpp b/src/main.cpp
index 3a6ef7c..5bb4bdb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,7 +8,7 @@
 #include <QStandardPaths>
 #include <openvr.h>
 #include <iostream>
-#include "logging.h"
+#include <easylogging++.h>
 
 INITIALIZE_EASYLOGGINGPP
 
diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp
index 7d0bece..fac5885 100644
--- a/src/overlaycontroller.cpp
+++ b/src/overlaycontroller.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <cmath>
 #include <openvr.h>
-#include "logging.h"
+#include <easylogging++.h>
 #include "utils/Matrix.h"
 
 // application namespace
diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h
index d4ebbf9..48cc081 100644
--- a/src/overlaycontroller.h
+++ b/src/overlaycontroller.h
@@ -22,7 +22,7 @@
 #include <QQuickRenderControl>
 #include <QSoundEffect>
 #include <memory>
-#include "logging.h"
+#include <easylogging++.h>
 #include "utils/ChaperoneUtils.h"
 
 #include "tabcontrollers/SteamVRTabController.h"
diff --git a/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp b/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp
index 5cb9238..139c3b3 100644
--- a/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp
+++ b/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp
@@ -1,6 +1,6 @@
 #include "audiomanagerwindows.h"
 #include <exception>
-#include "../../logging.h"
+#include "easylogging++.h"
 #include "../AudioTabController.h"
 
 #include <locale>
diff --git a/src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp b/src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp
index 40e596f..9ae37ac 100644
--- a/src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp
+++ b/src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp
@@ -1,6 +1,6 @@
 #include "KeyboardInputWindows.h"
 #include <Windows.h>
-#include "../../logging.h"
+#include "easylogging++.h"
 
 namespace advsettings
 {