From d23c3d3ec18150894adf5eb243d0f56f6ceef204 Mon Sep 17 00:00:00 2001
From: Mars <mars@pupbrained.xyz>
Date: Thu, 20 Jun 2024 13:35:59 -0400
Subject: [PATCH] move util out of include

---
 meson.build                      | 9 +--------
 src/config/config.h              | 2 +-
 src/config/weather.cpp           | 2 +-
 src/config/weather.h             | 4 ++--
 src/os/macos/bridge.h            | 7 ++++++-
 src/os/macos/bridge.mm           | 2 --
 src/os/os.h                      | 4 ++--
 {include => src}/util/macros.h   | 0
 {include => src}/util/numtypes.h | 0
 {include => src}/util/result.h   | 2 +-
 10 files changed, 14 insertions(+), 18 deletions(-)
 rename {include => src}/util/macros.h (100%)
 rename {include => src}/util/numtypes.h (100%)
 rename {include => src}/util/result.h (99%)

diff --git a/meson.build b/meson.build
index adb6f3d..e1bd376 100644
--- a/meson.build
+++ b/meson.build
@@ -93,12 +93,6 @@ if host_machine.system() == 'linux'
   deps += cpp.find_library('sdbus-c++')
 endif
 
-
-incdir = include_directories(
-  'include',
-  is_system: true # Ignores warnings from include dir
-)
-
 objc_args = []
 link_args = []
 
@@ -112,6 +106,5 @@ executable(
   sources,
   objc_args: objc_args,
   link_args: link_args,
-  dependencies: deps,
-  include_directories: incdir,
+  dependencies: deps
 )
diff --git a/src/config/config.h b/src/config/config.h
index 343827a..8adfcfa 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -3,7 +3,7 @@
 #include <rfl.hpp>
 #include <string>
 
-#include "util/macros.h"
+#include "../util/macros.h"
 #include "weather.h"
 
 // TODO: Make config values optional and supply defaults
diff --git a/src/config/weather.cpp b/src/config/weather.cpp
index 86ecdda..9bc3853 100644
--- a/src/config/weather.cpp
+++ b/src/config/weather.cpp
@@ -5,7 +5,7 @@
 
 #include "weather.h"
 
-#include "util/result.h"
+#include "../util/result.h"
 
 using WeatherOutput = Weather::WeatherOutput;
 
diff --git a/src/config/weather.h b/src/config/weather.h
index 60cfac3..a1393be 100644
--- a/src/config/weather.h
+++ b/src/config/weather.h
@@ -6,8 +6,8 @@
 #include <string>
 #include <variant>
 
-#include "util/macros.h"
-#include "util/numtypes.h"
+#include "../util/macros.h"
+#include "../util/numtypes.h"
 
 class Weather {
  public:
diff --git a/src/os/macos/bridge.h b/src/os/macos/bridge.h
index 671085e..d08b788 100644
--- a/src/os/macos/bridge.h
+++ b/src/os/macos/bridge.h
@@ -1,20 +1,25 @@
 #pragma once
 
 #ifdef __APPLE__
+
+#include "../../util/macros.h"
+
 #ifdef __OBJC__
+
 #import <Foundation/Foundation.h>
 
 @interface Bridge : NSObject
 + (NSDictionary*)currentPlayingMetadata;
 + (NSString*)macOSVersion;
 @end
+
 #else
-#include "util/macros.h"
 
 extern "C" {
   fn GetCurrentPlayingTitle() -> const char*;
   fn GetCurrentPlayingArtist() -> const char*;
   fn GetMacOSVersion() -> const char*;
 }
+
 #endif
 #endif
diff --git a/src/os/macos/bridge.mm b/src/os/macos/bridge.mm
index d22ce6a..2ed991a 100644
--- a/src/os/macos/bridge.mm
+++ b/src/os/macos/bridge.mm
@@ -90,8 +90,6 @@ using MRMediaRemoteGetNowPlayingInfoFunction =
 }
 @end
 
-#include "util/macros.h"
-
 extern "C" {
   fn GetCurrentPlayingTitle() -> const char* {
     NSDictionary* metadata = [Bridge currentPlayingMetadata];
diff --git a/src/os/os.h b/src/os/os.h
index 4b986e9..1da4157 100644
--- a/src/os/os.h
+++ b/src/os/os.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "util/macros.h"
-#include "util/numtypes.h"
+#include "../util/macros.h"
+#include "../util/numtypes.h"
 
 /**
  * @brief Get the amount of installed RAM in bytes.
diff --git a/include/util/macros.h b/src/util/macros.h
similarity index 100%
rename from include/util/macros.h
rename to src/util/macros.h
diff --git a/include/util/numtypes.h b/src/util/numtypes.h
similarity index 100%
rename from include/util/numtypes.h
rename to src/util/numtypes.h
diff --git a/include/util/result.h b/src/util/result.h
similarity index 99%
rename from include/util/result.h
rename to src/util/result.h
index 3641c9b..8c96ed2 100644
--- a/include/util/result.h
+++ b/src/util/result.h
@@ -5,7 +5,7 @@
 #include <utility>
 #include <variant>
 
-#include "util/macros.h"
+#include "macros.h"
 
 /**
  * @class Error