Use const char again for foreign toplevel functions

BuddiesOfBudgie · Nov 26, 2023 · 8bbd05c · 8bbd05c
1 parent 312b4f6
commit 8bbd05c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/foreign_toplevel.cpp b/src/foreign_toplevel.cpp
@@ -78,15 +78,15 @@ ForeignToplevelHandle::~ForeignToplevelHandle() noexcept {
 	wl_list_remove(&listeners.set_rectangle.link);
 }
 
-void ForeignToplevelHandle::set_title(const std::string& title) const {
-	if (!title.empty()) {
-		wlr_foreign_toplevel_handle_v1_set_title(&handle, title.c_str());
+void ForeignToplevelHandle::set_title(const char* title) const {
+	if (title != nullptr) {
+		wlr_foreign_toplevel_handle_v1_set_title(&handle, title);
 	}
 }
 
-void ForeignToplevelHandle::set_app_id(const std::string& app_id) const {
-	if (!app_id.empty()) {
-		wlr_foreign_toplevel_handle_v1_set_app_id(&handle, app_id.c_str());
+void ForeignToplevelHandle::set_app_id(const char* app_id) const {
+	if (app_id != nullptr) {
+		wlr_foreign_toplevel_handle_v1_set_app_id(&handle, app_id);
 	}
 }
 

diff --git a/src/foreign_toplevel.hpp b/src/foreign_toplevel.hpp
@@ -34,8 +34,8 @@ class ForeignToplevelHandle {
 	explicit ForeignToplevelHandle(View& view) noexcept;
 	~ForeignToplevelHandle() noexcept;
 
-	void set_title(const std::string& title) const;
-	void set_app_id(const std::string& app_id) const;
+	void set_title(const char* title) const;
+	void set_app_id(const char* app_id) const;
 	void set_parent(std::optional<std::reference_wrapper<const ForeignToplevelHandle>> parent) const;
 	void set_placement(ViewPlacement placement) const;
 	void set_maximized(bool maximized) const;

diff --git a/src/surface/xwayland_view.cpp b/src/surface/xwayland_view.cpp
@@ -233,12 +233,8 @@ void XWaylandView::map() {
 	xwayland_surface.surface->data = this;
 
 	toplevel_handle.emplace(*this);
-	if (xwayland_surface.title != nullptr) {
-		toplevel_handle->set_title(xwayland_surface.title);
-	}
-	if (xwayland_surface._class != nullptr) {
-		toplevel_handle->set_app_id(xwayland_surface._class);
-	}
+	toplevel_handle->set_title(xwayland_surface.title);
+	toplevel_handle->set_app_id(xwayland_surface._class);
 
 	wlr_scene_tree* scene_tree = wlr_scene_subsurface_tree_create(&server.scene->tree, xwayland_surface.surface);
 	scene_node = &scene_tree->node;