stuff

Author: igagis

src/ruisapp/application.hpp

@@ -32,6 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <utki/destructable.hpp>
 #include <utki/flags.hpp>
 #include <utki/singleton.hpp>
+#include <utki/unique_ref.hpp>
 #include <utki/util.hpp>
 
 #include "config.hpp"
@@ -52,12 +53,13 @@ class application : public utki::intrusive_singleton<application>
 	// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 	static instance_type instance;
 
-	std::vector<window> windows_v;
+	std::vector<utki::unique_ref<window>> windows_v;
 
 public:
 	const std::string name;
 
 private:
+	// TODO: remove
 	std::unique_ptr<utki::destructable> window_pimpl;
 
 	friend const decltype(window_pimpl)& get_window_pimpl(application& app);
@@ -72,7 +74,7 @@ class application : public utki::intrusive_singleton<application>
 	 * so the returned span's size is guaranteed to be >= 1.
 	 * @return A span of application windows. Size of the span is always >= 1.
 	 */
-	utki::span<window> windows()
+	utki::span<const utki::unique_ref<window>> windows()
 	{
 		return this->windows_v;
 	}

src/ruisapp/glue/glue.cpp

@@ -32,9 +32,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #elif CFG_OS == CFG_OS_LINUX
 #	ifdef RUISAPP_BACKEND_WAYLAND
 // NOLINTNEXTLINE(bugprone-suspicious-include)
-#		include "linux/glue_wayland.cxx"
+#		include "linux/wayland/glue.cxx"
 #	else
 // NOLINTNEXTLINE(bugprone-suspicious-include)
-#		include "linux/glue_xorg.cxx"
+#		include "linux/xorg/glue.cxx"
 #	endif
 #endif