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 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 #include #include -#include "logging.h" +#include 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 #include #include -#include "logging.h" +#include #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 #include #include -#include "logging.h" +#include #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 -#include "../../logging.h" +#include "easylogging++.h" #include "../AudioTabController.h" #include 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 -#include "../../logging.h" +#include "easylogging++.h" namespace advsettings {