fix: lint

This commit is contained in:
Alex
2025-06-22 10:01:36 +02:00
parent f27df33280
commit ee91d18ad9
8 changed files with 50 additions and 55 deletions

View File

@ -14,16 +14,16 @@
namespace waybar::modules {
class Gps : public ALabel {
class Gps : public ALabel {
public:
Gps(const std::string&, const Json::Value&);
virtual ~Gps();
auto update() -> void override;
private:
#ifdef WANT_RFKILL
#ifdef WANT_RFKILL
util::Rfkill rfkill_;
#endif
#endif
const std::string getFixModeName() const;
const std::string getFixModeString() const;
@ -35,6 +35,6 @@ namespace waybar::modules {
bool hideDisconnected = true;
bool hideNoFix = false;
};
};
} // namespace waybar::modules

View File

@ -35,7 +35,7 @@ waybar::modules::Custom::~Custom() {
void waybar::modules::Custom::delayWorker() {
thread_ = [this] {
for (int i: this->pid_children_) {
for (int i : this->pid_children_) {
int status;
waitpid(i, &status, 0);
}

View File

@ -1,4 +1,5 @@
#include "modules/gps.hpp"
#include <gps.h>
#include <spdlog/spdlog.h>
@ -15,15 +16,15 @@
#endif
namespace {
using namespace waybar::util;
constexpr const char *DEFAULT_FORMAT = "{mode}";
using namespace waybar::util;
constexpr const char* DEFAULT_FORMAT = "{mode}";
} // namespace
waybar::modules::Gps::Gps(const std::string& id, const Json::Value& config)
: ALabel(config, "gps", id, "{}", 5)
: ALabel(config, "gps", id, "{}", 5)
#ifdef WANT_RFKILL
,rfkill_{RFKILL_TYPE_GPS}
,
rfkill_{RFKILL_TYPE_GPS}
#endif
{
thread_ = [this] {
@ -66,9 +67,9 @@ waybar::modules::Gps::Gps(const std::string& id, const Json::Value& config)
}
};
#ifdef WANT_RFKILL
#ifdef WANT_RFKILL
rfkill_.on_update.connect(sigc::hide(sigc::mem_fun(*this, &Gps::update)));
#endif
#endif
}
const std::string waybar::modules::Gps::getFixModeName() const {
@ -80,9 +81,9 @@ const std::string waybar::modules::Gps::getFixModeName() const {
case MODE_3D:
return "fix-3d";
default:
#ifdef WANT_RFKILL
#ifdef WANT_RFKILL
if (rfkill_.getState()) return "disabled";
#endif
#endif
return "disconnected";
}
}
@ -120,9 +121,9 @@ const std::string waybar::modules::Gps::getFixStatusString() const {
return "PPS Fix";
default:
#ifdef WANT_RFKILL
#ifdef WANT_RFKILL
if (rfkill_.getState()) return "Disabled";
#endif
#endif
return "Unknown";
}
@ -131,7 +132,8 @@ const std::string waybar::modules::Gps::getFixStatusString() const {
auto waybar::modules::Gps::update() -> void {
sleep(0); // Wait for gps status change
if ((gps_data_.fix.mode == MODE_NOT_SEEN && hideDisconnected) || (gps_data_.fix.mode == MODE_NO_FIX && hideNoFix)) {
if ((gps_data_.fix.mode == MODE_NOT_SEEN && hideDisconnected) ||
(gps_data_.fix.mode == MODE_NO_FIX && hideNoFix)) {
event_box_.set_visible(false);
return;
}
@ -163,7 +165,6 @@ auto waybar::modules::Gps::update() -> void {
state_ = state;
}
auto format = format_;
fmt::dynamic_format_arg_store<fmt::format_context> store;
@ -205,13 +206,11 @@ auto waybar::modules::Gps::update() -> void {
}
}
label_.set_markup(text);
// Call parent update
ALabel::update();
// Call parent update
ALabel::update();
}
waybar::modules::Gps::~Gps() {
gps_stream(&gps_data_, WATCH_DISABLE, NULL);
gps_close(&gps_data_);
}

View File

@ -68,7 +68,8 @@ void Language::onEvent(const std::string& ev) {
std::string kbName(begin(ev) + ev.find_last_of('>') + 1, begin(ev) + ev.find_first_of(','));
// Last comma before variants parenthesis, eg:
// activelayout>>micro-star-int'l-co.,-ltd.-msi-gk50-elite-gaming-keyboard,English (US, intl., with dead keys)
// activelayout>>micro-star-int'l-co.,-ltd.-msi-gk50-elite-gaming-keyboard,English (US, intl.,
// with dead keys)
std::string beforParenthesis(begin(ev), begin(ev) + ev.find_last_of('('));
auto layoutName = ev.substr(beforParenthesis.find_last_of(',') + 1);

View File

@ -791,25 +791,21 @@ void Workspaces::sortSpecialCentered() {
size_t center = normalWorkspaces.size() / 2;
m_workspaces.insert(m_workspaces.end(),
std::make_move_iterator(normalWorkspaces.begin()),
m_workspaces.insert(m_workspaces.end(), std::make_move_iterator(normalWorkspaces.begin()),
std::make_move_iterator(normalWorkspaces.begin() + center));
m_workspaces.insert(m_workspaces.end(),
std::make_move_iterator(specialWorkspaces.begin()),
m_workspaces.insert(m_workspaces.end(), std::make_move_iterator(specialWorkspaces.begin()),
std::make_move_iterator(specialWorkspaces.end()));
m_workspaces.insert(m_workspaces.end(),
std::make_move_iterator(normalWorkspaces.begin() + center),
std::make_move_iterator(normalWorkspaces.end()));
m_workspaces.insert(m_workspaces.end(),
std::make_move_iterator(hiddenWorkspaces.begin()),
m_workspaces.insert(m_workspaces.end(), std::make_move_iterator(hiddenWorkspaces.begin()),
std::make_move_iterator(hiddenWorkspaces.end()));
}
void Workspaces::sortWorkspaces() {
std::ranges::sort( //
m_workspaces, [&](std::unique_ptr<Workspace> &a, std::unique_ptr<Workspace> &b) {
// Helper comparisons

View File

@ -172,7 +172,6 @@ std::string Workspaces::getIcon(const std::string &value, const Json::Value &ws)
const auto &icons = config_["format-icons"];
if (!icons) return value;
if (ws["is_urgent"].asBool() && icons["urgent"]) return icons["urgent"].asString();
if (ws["active_window_id"].isNull() && icons["empty"]) return icons["empty"].asString();