From 3b6a950380fe4cf72211394f811fb1d2bc25e47e Mon Sep 17 00:00:00 2001
From: patrick96
Date: Tue, 21 Sep 2021 21:27:42 +0200
Subject: [PATCH] Remove unused factory.hpp imports
---
include/utils/command.hpp | 1 -
include/utils/file.hpp | 1 -
include/utils/http.hpp | 1 -
include/utils/inotify.hpp | 1 -
include/utils/scope.hpp | 1 -
include/utils/socket.hpp | 1 -
src/components/bar.cpp | 1 -
src/components/command_line.cpp | 2 --
src/components/controller.cpp | 1 -
src/components/ipc.cpp | 2 +-
src/components/renderer.cpp | 1 -
src/components/taskqueue.cpp | 2 --
src/drawtypes/animation.cpp | 1 -
src/drawtypes/label.cpp | 1 -
src/drawtypes/progressbar.cpp | 1 -
src/drawtypes/ramp.cpp | 1 -
src/modules/bspwm.cpp | 1 -
src/modules/fs.cpp | 17 ++++++++---------
src/modules/i3.cpp | 1 -
src/modules/ipc.cpp | 6 +++---
src/modules/menu.cpp | 1 -
src/modules/mpd.cpp | 1 -
src/modules/network.cpp | 1 -
src/modules/xkeyboard.cpp | 1 -
src/modules/xwindow.cpp | 1 -
src/modules/xworkspaces.cpp | 1 -
src/tags/dispatch.cpp | 1 -
src/utils/file.cpp | 1 +
tests/unit_tests/drawtypes/ramp.cpp | 1 -
29 files changed, 13 insertions(+), 40 deletions(-)
diff --git a/include/utils/command.hpp b/include/utils/command.hpp
index b2c668a2..60a28601 100644
--- a/include/utils/command.hpp
+++ b/include/utils/command.hpp
@@ -6,7 +6,6 @@
#include "components/logger.hpp"
#include "components/types.hpp"
#include "errors.hpp"
-#include "utils/factory.hpp"
#include "utils/functional.hpp"
POLYBAR_NS
diff --git a/include/utils/file.hpp b/include/utils/file.hpp
index a6ebeacc..515b9084 100644
--- a/include/utils/file.hpp
+++ b/include/utils/file.hpp
@@ -3,7 +3,6 @@
#include
#include "common.hpp"
-#include "utils/factory.hpp"
POLYBAR_NS
diff --git a/include/utils/http.hpp b/include/utils/http.hpp
index 15581b1b..22e042ea 100644
--- a/include/utils/http.hpp
+++ b/include/utils/http.hpp
@@ -1,7 +1,6 @@
#pragma once
#include "common.hpp"
-#include "utils/factory.hpp"
POLYBAR_NS
diff --git a/include/utils/inotify.hpp b/include/utils/inotify.hpp
index 576c7880..333543fd 100644
--- a/include/utils/inotify.hpp
+++ b/include/utils/inotify.hpp
@@ -6,7 +6,6 @@
#include
#include "common.hpp"
-#include "utils/factory.hpp"
POLYBAR_NS
diff --git a/include/utils/scope.hpp b/include/utils/scope.hpp
index 32a200fc..f50ee7c3 100644
--- a/include/utils/scope.hpp
+++ b/include/utils/scope.hpp
@@ -4,7 +4,6 @@
#include "common.hpp"
#include "components/logger.hpp"
-#include "utils/factory.hpp"
POLYBAR_NS
diff --git a/include/utils/socket.hpp b/include/utils/socket.hpp
index 938d55ea..ae634c2b 100644
--- a/include/utils/socket.hpp
+++ b/include/utils/socket.hpp
@@ -3,7 +3,6 @@
#include
#include "common.hpp"
-#include "utils/factory.hpp"
POLYBAR_NS
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index 4244fb69..3c096efa 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -13,7 +13,6 @@
#include "tags/dispatch.hpp"
#include "utils/bspwm.hpp"
#include "utils/color.hpp"
-#include "utils/factory.hpp"
#include "utils/math.hpp"
#include "utils/string.hpp"
#include "x11/atoms.hpp"
diff --git a/src/components/command_line.cpp b/src/components/command_line.cpp
index 296e39ce..0ed11a94 100644
--- a/src/components/command_line.cpp
+++ b/src/components/command_line.cpp
@@ -2,8 +2,6 @@
#include
-#include "utils/factory.hpp"
-
POLYBAR_NS
namespace command_line {
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index 26c16dd8..85bca3b2 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -18,7 +18,6 @@
#include "modules/meta/event_handler.hpp"
#include "modules/meta/factory.hpp"
#include "utils/actions.hpp"
-#include "utils/factory.hpp"
#include "utils/inotify.hpp"
#include "utils/process.hpp"
#include "utils/string.hpp"
diff --git a/src/components/ipc.cpp b/src/components/ipc.cpp
index fbba93bd..301a4569 100644
--- a/src/components/ipc.cpp
+++ b/src/components/ipc.cpp
@@ -2,12 +2,12 @@
#include
#include
+#include
#include "components/logger.hpp"
#include "errors.hpp"
#include "events/signal.hpp"
#include "events/signal_emitter.hpp"
-#include "utils/factory.hpp"
#include "utils/file.hpp"
#include "utils/string.hpp"
diff --git a/src/components/renderer.cpp b/src/components/renderer.cpp
index 4dd1e168..2a668e47 100644
--- a/src/components/renderer.cpp
+++ b/src/components/renderer.cpp
@@ -7,7 +7,6 @@
#include "events/signal.hpp"
#include "events/signal_emitter.hpp"
#include "events/signal_receiver.hpp"
-#include "utils/factory.hpp"
#include "utils/math.hpp"
#include "x11/atoms.hpp"
#include "x11/background_manager.hpp"
diff --git a/src/components/taskqueue.cpp b/src/components/taskqueue.cpp
index 736c9b1c..b0ba3bbe 100644
--- a/src/components/taskqueue.cpp
+++ b/src/components/taskqueue.cpp
@@ -2,8 +2,6 @@
#include
-#include "utils/factory.hpp"
-
POLYBAR_NS
taskqueue::make_type taskqueue::make() {
diff --git a/src/drawtypes/animation.cpp b/src/drawtypes/animation.cpp
index d8e32b76..bafc6dff 100644
--- a/src/drawtypes/animation.cpp
+++ b/src/drawtypes/animation.cpp
@@ -1,7 +1,6 @@
#include "drawtypes/animation.hpp"
#include "drawtypes/label.hpp"
-#include "utils/factory.hpp"
POLYBAR_NS
diff --git a/src/drawtypes/label.cpp b/src/drawtypes/label.cpp
index 078c90cf..6dbdd680 100644
--- a/src/drawtypes/label.cpp
+++ b/src/drawtypes/label.cpp
@@ -3,7 +3,6 @@
#include
#include
-#include "utils/factory.hpp"
#include "utils/string.hpp"
POLYBAR_NS
diff --git a/src/drawtypes/progressbar.cpp b/src/drawtypes/progressbar.cpp
index d70fa67d..780ce929 100644
--- a/src/drawtypes/progressbar.cpp
+++ b/src/drawtypes/progressbar.cpp
@@ -4,7 +4,6 @@
#include "drawtypes/label.hpp"
#include "utils/color.hpp"
-#include "utils/factory.hpp"
#include "utils/math.hpp"
POLYBAR_NS
diff --git a/src/drawtypes/ramp.cpp b/src/drawtypes/ramp.cpp
index b8b72d1e..b8c026ba 100644
--- a/src/drawtypes/ramp.cpp
+++ b/src/drawtypes/ramp.cpp
@@ -1,6 +1,5 @@
#include "drawtypes/ramp.hpp"
-#include "utils/factory.hpp"
#include "utils/math.hpp"
POLYBAR_NS
diff --git a/src/modules/bspwm.cpp b/src/modules/bspwm.cpp
index 96e62916..c0a7228f 100644
--- a/src/modules/bspwm.cpp
+++ b/src/modules/bspwm.cpp
@@ -5,7 +5,6 @@
#include "drawtypes/iconset.hpp"
#include "drawtypes/label.hpp"
#include "modules/meta/base.inl"
-#include "utils/factory.hpp"
#include "utils/file.hpp"
#include "utils/string.hpp"
diff --git a/src/modules/fs.cpp b/src/modules/fs.cpp
index 0073eca8..2607ddee 100644
--- a/src/modules/fs.cpp
+++ b/src/modules/fs.cpp
@@ -1,16 +1,16 @@
+#include "modules/fs.hpp"
+
#include
+
#include
#include "drawtypes/label.hpp"
#include "drawtypes/progressbar.hpp"
#include "drawtypes/ramp.hpp"
-#include "modules/fs.hpp"
-#include "utils/factory.hpp"
+#include "modules/meta/base.inl"
#include "utils/math.hpp"
#include "utils/string.hpp"
-#include "modules/meta/base.inl"
-
POLYBAR_NS
// Columns in /proc/self/mountinfo
@@ -85,7 +85,8 @@ namespace modules {
// Get data for defined mountpoints
for (auto&& mountpoint : m_mountpoints) {
- auto details = std::find_if(mountinfo.begin(), mountinfo.end(), [&](const vector& m) { return m.size() > 4 && m[MOUNTINFO_DIR] == mountpoint; });
+ auto details = std::find_if(mountinfo.begin(), mountinfo.end(),
+ [&](const vector& m) { return m.size() > 4 && m[MOUNTINFO_DIR] == mountpoint; });
m_mounts.emplace_back(std::make_unique(mountpoint, details != mountinfo.end()));
struct statvfs buffer {};
@@ -179,10 +180,8 @@ namespace modules {
label->replace_token("%percentage_used%", to_string(mount->percentage_used));
label->replace_token(
"%total%", string_util::filesize(mount->bytes_total, m_fixed ? 2 : 0, m_fixed, m_bar.locale));
- label->replace_token(
- "%free%", string_util::filesize(mount->bytes_avail, m_fixed ? 2 : 0, m_fixed, m_bar.locale));
- label->replace_token(
- "%used%", string_util::filesize(mount->bytes_used, m_fixed ? 2 : 0, m_fixed, m_bar.locale));
+ label->replace_token("%free%", string_util::filesize(mount->bytes_avail, m_fixed ? 2 : 0, m_fixed, m_bar.locale));
+ label->replace_token("%used%", string_util::filesize(mount->bytes_used, m_fixed ? 2 : 0, m_fixed, m_bar.locale));
};
if (tag == TAG_BAR_FREE) {
diff --git a/src/modules/i3.cpp b/src/modules/i3.cpp
index 438d2a6f..d66ce117 100644
--- a/src/modules/i3.cpp
+++ b/src/modules/i3.cpp
@@ -5,7 +5,6 @@
#include "drawtypes/iconset.hpp"
#include "drawtypes/label.hpp"
#include "modules/meta/base.inl"
-#include "utils/factory.hpp"
#include "utils/file.hpp"
POLYBAR_NS
diff --git a/src/modules/ipc.cpp b/src/modules/ipc.cpp
index d12aa773..35d7889d 100644
--- a/src/modules/ipc.cpp
+++ b/src/modules/ipc.cpp
@@ -1,5 +1,7 @@
#include "modules/ipc.hpp"
+#include
+
#include "components/ipc.hpp"
#include "modules/meta/base.inl"
@@ -38,9 +40,7 @@ namespace modules {
m_actions.emplace(make_pair(mousebtn::DOUBLE_RIGHT, m_conf.get(name(), "double-click-right", ""s)));
// clang-format on
- const auto pid_token = [](const string& s) {
- return string_util::replace_all(s, "%pid%", to_string(getpid()));
- };
+ const auto pid_token = [](const string& s) { return string_util::replace_all(s, "%pid%", to_string(getpid())); };
for (auto& action : m_actions) {
action.second = pid_token(action.second);
diff --git a/src/modules/menu.cpp b/src/modules/menu.cpp
index 993cfa14..69d4c30b 100644
--- a/src/modules/menu.cpp
+++ b/src/modules/menu.cpp
@@ -4,7 +4,6 @@
#include "events/signal.hpp"
#include "modules/meta/base.inl"
#include "utils/actions.hpp"
-#include "utils/factory.hpp"
#include "utils/scope.hpp"
POLYBAR_NS
diff --git a/src/modules/mpd.cpp b/src/modules/mpd.cpp
index 7056c789..db664e4d 100644
--- a/src/modules/mpd.cpp
+++ b/src/modules/mpd.cpp
@@ -6,7 +6,6 @@
#include "drawtypes/label.hpp"
#include "drawtypes/progressbar.hpp"
#include "modules/meta/base.inl"
-#include "utils/factory.hpp"
POLYBAR_NS
diff --git a/src/modules/network.cpp b/src/modules/network.cpp
index dbc29a83..9e979bd8 100644
--- a/src/modules/network.cpp
+++ b/src/modules/network.cpp
@@ -4,7 +4,6 @@
#include "drawtypes/label.hpp"
#include "drawtypes/ramp.hpp"
#include "modules/meta/base.inl"
-#include "utils/factory.hpp"
POLYBAR_NS
diff --git a/src/modules/xkeyboard.cpp b/src/modules/xkeyboard.cpp
index da4748d9..bae29913 100644
--- a/src/modules/xkeyboard.cpp
+++ b/src/modules/xkeyboard.cpp
@@ -3,7 +3,6 @@
#include "drawtypes/iconset.hpp"
#include "drawtypes/label.hpp"
#include "modules/meta/base.inl"
-#include "utils/factory.hpp"
#include "x11/atoms.hpp"
#include "x11/connection.hpp"
diff --git a/src/modules/xwindow.cpp b/src/modules/xwindow.cpp
index 010750c1..f0752cb1 100644
--- a/src/modules/xwindow.cpp
+++ b/src/modules/xwindow.cpp
@@ -2,7 +2,6 @@
#include "drawtypes/label.hpp"
#include "modules/meta/base.inl"
-#include "utils/factory.hpp"
#include "x11/atoms.hpp"
#include "x11/connection.hpp"
diff --git a/src/modules/xworkspaces.cpp b/src/modules/xworkspaces.cpp
index 8bd802f2..9cd932c0 100644
--- a/src/modules/xworkspaces.cpp
+++ b/src/modules/xworkspaces.cpp
@@ -7,7 +7,6 @@
#include "drawtypes/iconset.hpp"
#include "drawtypes/label.hpp"
#include "modules/meta/base.inl"
-#include "utils/factory.hpp"
#include "utils/math.hpp"
#include "x11/atoms.hpp"
#include "x11/connection.hpp"
diff --git a/src/tags/dispatch.cpp b/src/tags/dispatch.cpp
index 9fd0e84c..278d6838 100644
--- a/src/tags/dispatch.cpp
+++ b/src/tags/dispatch.cpp
@@ -7,7 +7,6 @@
#include "settings.hpp"
#include "tags/parser.hpp"
#include "utils/color.hpp"
-#include "utils/factory.hpp"
POLYBAR_NS
diff --git a/src/utils/file.cpp b/src/utils/file.cpp
index d8303054..b14569cc 100644
--- a/src/utils/file.cpp
+++ b/src/utils/file.cpp
@@ -4,6 +4,7 @@
#include
#include
#include
+#include
#include
#include
diff --git a/tests/unit_tests/drawtypes/ramp.cpp b/tests/unit_tests/drawtypes/ramp.cpp
index 36a34f4c..f68b2694 100644
--- a/tests/unit_tests/drawtypes/ramp.cpp
+++ b/tests/unit_tests/drawtypes/ramp.cpp
@@ -1,7 +1,6 @@
#include "drawtypes/ramp.hpp"
#include "common/test.hpp"
-#include "utils/factory.hpp"
using namespace polybar::drawtypes;
using namespace polybar;