Move everything into the WUPSBackend namespace

include/wups_backend/PluginContainer.h

@@ -24,9 +24,10 @@
 #include "PluginData.h"
 #include "PluginMetaInformation.h"
 
-class PluginContainer {
+namespace WUPSBackend {
+    class PluginContainer {
 
-public:
+    public:
         PluginContainer(std::shared_ptr<PluginData> data, std::shared_ptr<PluginMetaInformation> metaInfo) : pluginData(std::move(data)),
                                                                                                              metaInformation(std::move(metaInfo)) {
         }
@@ -41,4 +42,5 @@ public:
 
         const std::shared_ptr<PluginData> pluginData;
         const std::shared_ptr<PluginMetaInformation> metaInformation;
-};
+    };
+} // namespace WUPSBackend

include/wups_backend/PluginData.h

@@ -19,9 +19,10 @@
 #include <cstdint>
 #include <wups_backend/import_defines.h>
 
-class PluginData {
+namespace WUPSBackend {
+    class PluginData {
 
-public:
+    public:
         explicit PluginData(uint32_t handle);
         ~PluginData();
 
@@ -30,4 +31,5 @@ public:
         }
 
         uint32_t handle;
-};
+    };
+} // namespace WUPSBackend

include/wups_backend/PluginMetaInformation.h

@@ -21,8 +21,9 @@
 #include <string>
 #include <vector>
 
-class PluginMetaInformation {
-public:
+namespace WUPSBackend {
+    class PluginMetaInformation {
+    public:
         [[nodiscard]] const std::string &getName() const {
             return name;
         }
@@ -64,7 +65,7 @@ public:
                               std::string storageId,
                               size_t size);
 
-private:
+    private:
         PluginMetaInformation() = default;
 
         void setName(std::string name_) {
@@ -107,4 +108,5 @@ private:
         std::string description;
         std::string storageId;
         size_t size{};
-};
+    };
+} // namespace WUPSBackend

include/wups_backend/PluginUtils.h

@@ -20,8 +20,9 @@
 #include "PluginMetaInformation.h"
 #include <optional>
 
-class PluginUtils {
-public:
+namespace WUPSBackend {
+    class PluginUtils {
+    public:
         static std::optional<std::unique_ptr<PluginMetaInformation>> getMetaInformationForBuffer(char *buffer, size_t size);
 
         static std::optional<std::unique_ptr<PluginMetaInformation>> getMetaInformationForPath(const std::string &path);
@@ -33,4 +34,5 @@ public:
         static std::optional<std::unique_ptr<PluginContainer>> getPluginForBuffer(char *buffer, size_t size);
 
         static int32_t LoadAndLinkOnRestart(const std::vector<std::unique_ptr<PluginContainer>> &plugins);
-};
+    };
+} // namespace WUPSBackend

source/PluginData.cpp

@@ -20,6 +20,8 @@
 #include "logger.h"
 #include <coreinit/debug.h>
 
+using namespace WUPSBackend;
+
 PluginData::PluginData(uint32_t handle) {
     this->handle = handle;
 }

source/PluginMetaInformation.cpp

@@ -18,9 +18,10 @@
 #include "wups_backend/PluginMetaInformation.h"
 
 #include <cstring>
-#include <optional>
 #include <utility>
 
+using namespace WUPSBackend;
+
 PluginMetaInformation::PluginMetaInformation(std::string name,
                                              std::string author,
                                              std::string version,

source/PluginUtils.cpp

@@ -22,6 +22,8 @@
 #include <cstring>
 #include <memory>
 
+using namespace WUPSBackend;
+
 std::optional<std::unique_ptr<PluginMetaInformation>> getMetaInformation(const plugin_information &info) {
     if (info.plugin_information_version != PLUGIN_INFORMATION_VERSION) {
         DEBUG_FUNCTION_LINE_ERR("Version mismatch");