From e83d65909036dc1985ae672e7c5e5d51a30eb04c Mon Sep 17 00:00:00 2001
From: pupbrained <mars@pupbrained.xyz>
Date: Sun, 4 May 2025 15:45:54 -0400
Subject: [PATCH] updat

---
 meson.build                                 | 10 +++++-----
 src/os/bsd/{pkg_count.cpp => package.cpp}   |  4 ++--
 src/os/haiku/{pkg_count.cpp => package.cpp} |  4 ++++
 src/os/linux/{pkg_count.cpp => package.cpp} |  5 -----
 4 files changed, 11 insertions(+), 12 deletions(-)
 rename src/os/bsd/{pkg_count.cpp => package.cpp} (100%)
 rename src/os/haiku/{pkg_count.cpp => package.cpp} (92%)
 rename src/os/linux/{pkg_count.cpp => package.cpp} (84%)

diff --git a/meson.build b/meson.build
index a0e5ce8..601423c 100644
--- a/meson.build
+++ b/meson.build
@@ -92,11 +92,11 @@ base_sources = files('src/core/system_data.cpp', 'src/core/package.cpp', 'src/co
 
 platform_sources = {
   'darwin' : ['src/os/macos.cpp', 'src/os/macos/bridge.mm'],
-  'dragonfly' : ['src/os/bsd.cpp', 'src/os/bsd/pkg_count.cpp'],
-  'freebsd' : ['src/os/bsd.cpp', 'src/os/bsd/pkg_count.cpp'],
-  'haiku' : ['src/os/haiku.cpp'],
-  'linux' : ['src/os/linux.cpp', 'src/os/linux/pkg_count.cpp'],
-  'netbsd' : ['src/os/bsd.cpp', 'src/os/bsd/pkg_count.cpp'],
+  'dragonfly' : ['src/os/bsd.cpp', 'src/os/bsd/package.cpp'],
+  'freebsd' : ['src/os/bsd.cpp', 'src/os/bsd/package.cpp'],
+  'haiku' : ['src/os/haiku.cpp', 'src/os/haiku/package.cpp'],
+  'linux' : ['src/os/linux.cpp', 'src/os/linux/package.cpp'],
+  'netbsd' : ['src/os/bsd.cpp', 'src/os/bsd/package.cpp'],
   'serenity' : ['src/os/serenity.cpp'],
   'windows' : ['src/os/windows.cpp'],
 }
diff --git a/src/os/bsd/pkg_count.cpp b/src/os/bsd/package.cpp
similarity index 100%
rename from src/os/bsd/pkg_count.cpp
rename to src/os/bsd/package.cpp
index ff3d4e0..489ad49 100644
--- a/src/os/bsd/pkg_count.cpp
+++ b/src/os/bsd/package.cpp
@@ -1,15 +1,15 @@
 #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
 
 // clang-format off
+#include "src/core/package.hpp"
+
 #include <SQLiteCpp/Database.h>  // SQLite::{Database, OPEN_READONLY}
 #include <SQLiteCpp/Exception.h> // SQLite::Exception
 #include <SQLiteCpp/Statement.h> // SQLite::Statement
-
 #include <glaze/beve/write.hpp>  // glz::write_beve
 #include <glaze/core/common.hpp> // glz::object
 #include <glaze/core/meta.hpp>   // glz::detail::Object
 
-#include "src/core/package.hpp"
 #include "src/util/defs.hpp"
 // clang-format on
 
diff --git a/src/os/haiku/pkg_count.cpp b/src/os/haiku/package.cpp
similarity index 92%
rename from src/os/haiku/pkg_count.cpp
rename to src/os/haiku/package.cpp
index ecbd660..189f326 100644
--- a/src/os/haiku/pkg_count.cpp
+++ b/src/os/haiku/package.cpp
@@ -1,9 +1,13 @@
 #ifdef __HAIKU__
 
 // clang-format off
+#include "src/core/package.hpp"
+
 #include <os/package/PackageDefs.h>    // BPackageKit::BPackageInfoSet
 #include <os/package/PackageInfoSet.h> // BPackageKit::BPackageInfo
 #include <os/package/PackageRoster.h>  // BPackageKit::BPackageRoster
+
+#include "src/util/defs.hpp"
 // clang-format on
 
 namespace package {
diff --git a/src/os/linux/pkg_count.cpp b/src/os/linux/package.cpp
similarity index 84%
rename from src/os/linux/pkg_count.cpp
rename to src/os/linux/package.cpp
index fa207d0..76148b0 100644
--- a/src/os/linux/pkg_count.cpp
+++ b/src/os/linux/package.cpp
@@ -11,13 +11,8 @@
 #include <glaze/beve/write.hpp>   // glz::write_beve
 
 #include "src/util/defs.hpp"
-#include "src/util/error.hpp"
-#include "src/util/types.hpp"
 // clang-format on
 
-using util::error::DracError;
-using util::types::u64, util::types::i64, util::types::Result, util::types::Err, util::types::String,
-  util::types::StringView, util::types::Exception;
 using namespace std::string_literals;
 
 namespace package {