From 497a2ce308b87a922b6b52504dbe5b091a3fea67 Mon Sep 17 00:00:00 2001
From: Gwilherm Folliot <gwilherm55fo@gmail.com>
Date: Thu, 26 Sep 2024 11:58:04 +0200
Subject: [PATCH] input-capture: code cleanup

---
 CMakeLists.txt               | 1 -
 src/core/PortalManager.cpp   | 4 ----
 src/core/PortalManager.hpp   | 2 --
 src/portals/InputCapture.cpp | 5 +----
 src/portals/InputCapture.hpp | 9 ++-------
 src/shared/Eis.cpp           | 3 +--
 src/shared/Eis.hpp           | 1 -
 7 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6390e9b..7ba0b5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,6 @@ pkg_check_modules(
   libspa-0.2
   libdrm
   libeis-1.0
-  dbus-1
   gbm
   hyprlang>=0.2.0
   hyprutils
diff --git a/src/core/PortalManager.cpp b/src/core/PortalManager.cpp
index 3aa7a11..a916f6b 100644
--- a/src/core/PortalManager.cpp
+++ b/src/core/PortalManager.cpp
@@ -1,10 +1,7 @@
 #include "PortalManager.hpp"
 #include "../helpers/Log.hpp"
 #include "../helpers/MiscFunctions.hpp"
-#include "wayland.hpp"
 
-#include <hyprutils/memory/SharedPtr.hpp>
-#include <memory>
 #include <pipewire/pipewire.h>
 #include <poll.h>
 #include <sys/mman.h>
@@ -12,7 +9,6 @@
 #include <unistd.h>
 
 #include <thread>
-#include <vector>
 
 SOutput::SOutput(SP<CCWlOutput> output_) : output(output_) {
     output->setName([this](CCWlOutput* o, const char* name_) {
diff --git a/src/core/PortalManager.hpp b/src/core/PortalManager.hpp
index 9ef4c72..745ad77 100644
--- a/src/core/PortalManager.hpp
+++ b/src/core/PortalManager.hpp
@@ -1,9 +1,7 @@
 #pragma once
 
-#include <cstdint>
 #include <memory>
 #include <sdbus-c++/sdbus-c++.h>
-
 #include <hyprlang.hpp>
 
 #include "wayland.hpp"
diff --git a/src/portals/InputCapture.cpp b/src/portals/InputCapture.cpp
index 266e0ef..8dcd8ee 100644
--- a/src/portals/InputCapture.cpp
+++ b/src/portals/InputCapture.cpp
@@ -2,14 +2,11 @@
 
 #include "../core/PortalManager.hpp"
 #include "../helpers/Log.hpp"
+#include "../shared/Session.hpp"
 #include "hyprland-input-capture-v1.hpp"
-#include "shared/Session.hpp"
-#include "src/shared/Eis.hpp"
 #include <cstddef>
 #include <cstdint>
 #include <memory>
-#include <sdbus-c++/IConnection.h>
-#include <sdbus-c++/Types.h>
 #include <string>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/src/portals/InputCapture.hpp b/src/portals/InputCapture.hpp
index 0ab78d1..5e7a880 100644
--- a/src/portals/InputCapture.hpp
+++ b/src/portals/InputCapture.hpp
@@ -1,14 +1,9 @@
 #pragma once
 #include "hyprland-input-capture-v1.hpp"
-#include "shared/Eis.hpp"
-#include <cstdint>
-#include <sdbus-c++/Types.h>
-#include <sdbus-c++/sdbus-c++.h>
-#include <string>
-#include <unordered_map>
-#include <wayland-client-protocol.h>
+#include "../shared/Eis.hpp"
 #include "../includes.hpp"
 #include "../shared/Session.hpp"
+#include <sdbus-c++/Types.h>
 
 typedef int        ClientStatus;
 const ClientStatus CREATED   = 0; //Is ready to be activated
diff --git a/src/shared/Eis.cpp b/src/shared/Eis.cpp
index 2bab58c..b950de9 100644
--- a/src/shared/Eis.cpp
+++ b/src/shared/Eis.cpp
@@ -1,8 +1,7 @@
 #include "Eis.hpp"
-#include "core/PortalManager.hpp"
+#include "../core/PortalManager.hpp"
 #include "src/helpers/Log.hpp"
 #include <libeis.h>
-#include <string>
 #include <sys/poll.h>
 #include <thread>
 
diff --git a/src/shared/Eis.hpp b/src/shared/Eis.hpp
index 63b4e78..9c35bbd 100644
--- a/src/shared/Eis.hpp
+++ b/src/shared/Eis.hpp
@@ -2,7 +2,6 @@
 
 #include <libeis.h>
 #include <string>
-#include <sys/socket.h>
 
 struct EisClient {
     struct eis_client* handle;