Adjusted Platform Structure

source/platform/linux/platform.cpp

@@ -28,8 +28,6 @@
 namespace fennec
 {
 
-using namespace wayland;
-
 linux_platform::linux_platform(user _type)
 	: platform(_type)
 	, _display_driver(display_none) {
@@ -45,7 +43,10 @@ linux_platform::linux_platform(user _type)
 }
 
 linux_platform::~linux_platform() {
-
+	if (_display) {
+		delete _display;
+		_display = nullptr;
+	}
 }
 
 shared_object* linux_platform::load_object(const cstring& file) {
@@ -77,10 +78,10 @@ display* linux_platform::get_display() {
 
 void linux_platform::_runtime_client_checks() {
 #ifdef FENNEC_LIB_WAYLAND
-	if (wayland::load_symbols(this)) {
+	if (libwayland::load_symbols(this)) {
 		_display_driver = display_wayland;
 		_display = new wayland_display(this);
-		wayland::unload_symbols(this); // Doesn't actually unload symbols, just resets ref counter to only consider
+		libwayland::unload_symbols(this); // Doesn't actually unload symbols, just resets ref counter to only consider
 		                               // the created display
 	}
 #endif

source/platform/linux/wayland/display.cpp

@@ -23,14 +23,11 @@
 namespace fennec
 {
 
-namespace wayland
-{
-
 wayland_display::wayland_display(linux_platform* platform)
 	: display()
 	, _handle()
 	, _platform(platform) {
-	load_symbols(_platform);
+	libwayland::load_symbols(_platform);
 	_handle = wl_display_connect(nullptr);
 }
 
@@ -38,13 +35,13 @@ wayland_display::wayland_display(linux_platform* platform, const cstring& drv)
 	: display()
 	, _handle()
 	, _platform(platform) {
-	load_symbols(_platform);
+	libwayland::load_symbols(_platform);
 	_handle = wl_display_connect(drv);
 }
 
 wayland_display::~wayland_display() {
 	wl_display_disconnect(_handle);
-	unload_symbols(_platform);
+	libwayland::unload_symbols(_platform);
 	_handle = nullptr;
 	_platform = nullptr;
 }
@@ -53,6 +50,4 @@ bool wayland_display::connected() const {
 	return _handle != nullptr;
 }
 
-}
-
 }

source/platform/linux/wayland/lib/dyn.cpp

@@ -22,7 +22,7 @@
 namespace fennec
 {
 
-namespace wayland
+namespace libwayland
 {
 
 using shared_lib = platform::shared_lib;