Skip to content

Commit aefcb62

Browse files
committed
Resolve some warnings from clang-tidy and Resharper
1 parent 221970d commit aefcb62

File tree

9 files changed

+13
-14
lines changed

9 files changed

+13
-14
lines changed

src/input/cursor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void Cursor::process_resize(const uint32_t time) const {
3434
* you'd wait for the client to prepare a buffer at the new size, then
3535
* commit any movement that was prepared.
3636
*/
37-
std::shared_ptr<View> view = seat.server.grabbed_view.lock();
37+
const std::shared_ptr<View> view = seat.server.grabbed_view.lock();
3838

3939
if (view == nullptr) {
4040
wlr_log(WLR_ERROR, "Attempted to process_resize without a grabbed view");
@@ -186,7 +186,7 @@ static void cursor_button_notify(wl_listener* listener, void* data) {
186186
double sy;
187187

188188
wlr_surface* surface = nullptr;
189-
auto magpie_surface = server.surface_at(cursor.wlr.x, cursor.wlr.y, &surface, &sx, &sy).lock();
189+
const auto magpie_surface = server.surface_at(cursor.wlr.x, cursor.wlr.y, &surface, &sx, &sy).lock();
190190

191191
if (event->state == WL_POINTER_BUTTON_STATE_RELEASED) {
192192
/* If you released any buttons, we exit interactive move/resize mode. */
@@ -474,7 +474,7 @@ void Cursor::reset_mode() {
474474
}
475475

476476
void Cursor::warp_to_constraint(const PointerConstraint& constraint) const {
477-
auto focused_view = seat.server.focused_view.lock();
477+
const auto focused_view = seat.server.focused_view.lock();
478478

479479
if (focused_view == nullptr) {
480480
// only warp to constraints tied to views...

src/input/keyboard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static void keyboard_handle_destroy(wl_listener* listener, [[maybe_unused]] void
2828
}
2929

3030
static bool handle_compositor_keybinding(const Keyboard& keyboard, const uint32_t modifiers, const xkb_keysym_t sym) {
31-
Server& server = keyboard.seat.server;
31+
const Server& server = keyboard.seat.server;
3232

3333
if (modifiers == WLR_MODIFIER_ALT) {
3434
switch (sym) {

src/input/seat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ void Seat::apply_constraint(const wlr_pointer* pointer, double* dx, double* dy)
210210
return;
211211
}
212212

213-
auto focused_view = server.focused_view.lock();
213+
const auto focused_view = server.focused_view.lock();
214214

215215
if (focused_view == nullptr) {
216216
wlr_log(WLR_DEBUG, "Attempted to apply a pointer constraint without a focused view");

src/protocols/budgie_keyboard_shortcuts.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static void budgie_keyboard_shortcuts_subscriber_unregister_shortcut(
6060
free(target);
6161
}
6262

63-
static const struct budgie_keyboard_shortcuts_subscriber_interface budgie_keyboard_shortcuts_subscriber_impl = {
63+
static constexpr struct budgie_keyboard_shortcuts_subscriber_interface budgie_keyboard_shortcuts_subscriber_impl = {
6464
.destroy = budgie_keyboard_shortcuts_subscriber_destroy,
6565
.register_shortcut = budgie_keyboard_shortcuts_subscriber_register_shortcut,
6666
.unregister_shortcut = budgie_keyboard_shortcuts_subscriber_unregister_shortcut,
@@ -111,7 +111,7 @@ static void budgie_keyboard_shortcuts_manager_subscribe(wl_client* client, wl_re
111111
wl_signal_emit_mutable(&manager->events.subscribe, subscriber);
112112
}
113113

114-
static const struct budgie_keyboard_shortcuts_manager_interface budgie_keyboard_shortcuts_manager_impl = {
114+
static constexpr struct budgie_keyboard_shortcuts_manager_interface budgie_keyboard_shortcuts_manager_impl = {
115115
.destroy = budgie_keyboard_shortcuts_manager_destroy,
116116
.subscribe = budgie_keyboard_shortcuts_manager_subscribe,
117117
};

src/server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void Server::try_focus_next_exclusive_layer() {
101101
focus_layer(topmost_exclusive_layer);
102102
}
103103

104-
void Server::focus_layer(std::shared_ptr<Layer> layer) {
104+
void Server::focus_layer(const std::shared_ptr<Layer>& layer) {
105105
if (layer == nullptr) {
106106
focused_layer.reset();
107107
if (focused_view.lock() != nullptr) {

src/server.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class Server final : public std::enable_shared_from_this<Server> {
109109

110110
std::weak_ptr<Surface> surface_at(double lx, double ly, wlr_surface** wlr, double* sx, double* sy) const;
111111
void focus_view(std::shared_ptr<View>&& view);
112-
void focus_layer(std::shared_ptr<Layer> layer);
112+
void focus_layer(const std::shared_ptr<Layer>& layer);
113113
void try_focus_next_exclusive_layer();
114114
bool is_restricted(const wl_global* global) const;
115115
};

src/surface/layer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static void wlr_layer_surface_v1_map_notify(wl_listener* listener, [[maybe_unuse
4444
static void wlr_layer_surface_v1_unmap_notify(wl_listener* listener, [[maybe_unused]] void* data) {
4545
wlr_log(WLR_DEBUG, "wlr_layer_surface_v1.events.unmap(listener=%p, data=%p)", (void*) listener, data);
4646

47-
Layer& layer = magpie_container_of(listener, layer, unmap);
47+
const Layer& layer = magpie_container_of(listener, layer, unmap);
4848

4949
wlr_scene_node_set_enabled(layer.scene_node, false);
5050
}
@@ -97,7 +97,7 @@ static void wlr_layer_surface_v1_new_popup_notify(wl_listener* listener, void* d
9797
return;
9898
}
9999

100-
Layer& layer = magpie_container_of(listener, layer, new_popup);
100+
const Layer& layer = magpie_container_of(listener, layer, new_popup);
101101
auto* surface = static_cast<Surface*>(layer.wlr.surface->data);
102102
surface->popups.emplace(std::make_shared<Popup>(*surface, *static_cast<wlr_xdg_popup*>(data)));
103103
}

src/surface/subsurface.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <utility>
66

77
#include "wlr-wrap-start.hpp"
8-
#include <wlr/types/wlr_layer_shell_v1.h>
98
#include <wlr/types/wlr_output_layout.h>
109
#include <wlr/types/wlr_subcompositor.h>
1110
#include <wlr/util/log.h>

src/surface/xdg_view.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ XdgView::XdgView(Server& server, wlr_xdg_toplevel& xdg_toplevel) noexcept
200200
toplevel_handle->set_app_id(xdg_toplevel.app_id);
201201

202202
if (xdg_toplevel.parent != nullptr) {
203-
auto* m_view = dynamic_cast<View*>(static_cast<Surface*>(xdg_toplevel.parent->base->data));
203+
const auto* m_view = dynamic_cast<View*>(static_cast<Surface*>(xdg_toplevel.parent->base->data));
204204
if (m_view != nullptr) {
205205
toplevel_handle->set_parent(m_view->toplevel_handle);
206206
}
@@ -282,7 +282,7 @@ void XdgView::map() {
282282
wlr_xdg_surface_get_geometry(wlr.base, &current);
283283

284284
if (!server.outputs.empty()) {
285-
auto* const output = static_cast<Output*>(wlr_output_layout_get_center_output(server.output_layout)->data);
285+
const auto* const output = static_cast<Output*>(wlr_output_layout_get_center_output(server.output_layout)->data);
286286
const auto usable_area = output->usable_area;
287287
const auto center_x = usable_area.x + (usable_area.width / 2);
288288
const auto center_y = usable_area.y + (usable_area.height / 2);

0 commit comments

Comments
 (0)