Fix warnings on usued imports

orontee · Oct 5, 2023 · 8f84cc1 · 8f84cc1
1 parent 3223338
commit 8f84cc1
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 20 deletions.
diff --git a/src/app.h b/src/app.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <array>
+#include <boost/log/trivial.hpp>
 #include <cctype>
 #include <cstring>
 #include <ctime>
@@ -18,7 +19,6 @@
 #include "events.h"
 #include "history.h"
 #include "l10n.h"
-#include "logging.h"
 #include "model.h"
 #include "service.h"
 #include "state.h"

diff --git a/src/config.h b/src/config.h
@@ -1,11 +1,10 @@
 #pragma once
 
+#include <boost/log/trivial.hpp>
 #include <inkview.h>
 #include <memory>
 #include <string>
 
-#include "logging.h"
-
 namespace taranis {
 
 struct Config {

diff --git a/src/history.h b/src/history.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <algorithm>
+#include <boost/log/trivial.hpp>
 #include <experimental/optional>
 #include <fstream>
 #include <inkview.h>
 #include <memory>
 
-#include "logging.h"
 #include "model.h"
 
 namespace std {

diff --git a/src/http.cc b/src/http.cc
@@ -1,9 +1,10 @@
 #include "http.h"
 
-#include "errors.h"
-#include "logging.h"
+#include <boost/log/trivial.hpp>
 #include <sstream>
 
+#include "errors.h"
+
 Json::Value taranis::HttpClient::get(const std::string &url) {
   BOOST_LOG_TRIVIAL(debug) << "Sending GET request " << url;
 

diff --git a/src/icons.h b/src/icons.h
@@ -1,10 +1,9 @@
 #pragma once
 
+#include <boost/log/trivial.hpp>
 #include <inkview.h>
 #include <string>
 
-#include "logging.h"
-
 extern const ibitmap icon_01n_2x;
 extern const ibitmap icon_02n_2x;
 extern const ibitmap icon_03n_2x;

diff --git a/src/l10n.h b/src/l10n.h
@@ -1,10 +1,9 @@
 #pragma once
 
+#include <boost/log/trivial.hpp>
 #include <cstring>
 #include <inkview.h>
 
-#include "logging.h"
-
 namespace taranis {
 inline void initialize_translations() {
   const auto current_language = currentLang();

diff --git a/src/logging.h b/src/logging.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <boost/log/trivial.hpp>
-// Unused here but exposes the macros to consumers
-
 namespace taranis {
 
 void initialize_logging(bool verbose_log);

diff --git a/src/main.cc b/src/main.cc
@@ -1,3 +1,4 @@
+#include <boost/log/trivial.hpp>
 #include <inkview.h>
 #include <stdexcept>
 

diff --git a/src/service.cc b/src/service.cc
@@ -1,7 +1,8 @@
 #include "service.h"
 
+#include <boost/log/trivial.hpp>
+
 #include "errors.h"
-#include "logging.h"
 
 namespace taranis {
 

diff --git a/src/state.cc b/src/state.cc
@@ -1,11 +1,10 @@
 #include "state.h"
 
-#include "json/writer.h"
+#include <boost/log/trivial.hpp>
 #include <fstream>
 #include <inkview.h>
 #include <iomanip>
-
-#include "logging.h"
+#include <json/writer.h>
 
 constexpr char LOCATION_HISTORY_KEY[]{"location_history"};
 

diff --git a/src/ui.cc b/src/ui.cc
@@ -1,10 +1,10 @@
 #include "ui.h"
 
-#include "boost/log/trivial.hpp"
+#include <boost/log/trivial.hpp>
+#include <inkview.h>
+
 #include "events.h"
 #include "history.h"
-#include "inkview.h"
-#include "logging.h"
 #include "menu.h"
 #include "model.h"