From 2da233608289b02fb2cafa672e3b093a77a3d10a Mon Sep 17 00:00:00 2001 From: Maschell Date: Fri, 17 Feb 2023 12:03:27 +0100 Subject: [PATCH] Move everything into the WUPSBackend namespace --- include/wups_backend/PluginContainer.h | 30 ++-- include/wups_backend/PluginData.h | 20 +-- include/wups_backend/PluginMetaInformation.h | 140 ++++++++++--------- include/wups_backend/PluginUtils.h | 20 +-- source/PluginData.cpp | 4 +- source/PluginMetaInformation.cpp | 3 +- source/PluginUtils.cpp | 2 + 7 files changed, 116 insertions(+), 103 deletions(-) diff --git a/include/wups_backend/PluginContainer.h b/include/wups_backend/PluginContainer.h index c2c8c11..77c0e10 100644 --- a/include/wups_backend/PluginContainer.h +++ b/include/wups_backend/PluginContainer.h @@ -24,21 +24,23 @@ #include "PluginData.h" #include "PluginMetaInformation.h" -class PluginContainer { +namespace WUPSBackend { + class PluginContainer { -public: - PluginContainer(std::shared_ptr data, std::shared_ptr metaInfo) : pluginData(std::move(data)), - metaInformation(std::move(metaInfo)) { - } + public: + PluginContainer(std::shared_ptr data, std::shared_ptr metaInfo) : pluginData(std::move(data)), + metaInformation(std::move(metaInfo)) { + } - [[nodiscard]] const std::shared_ptr &getMetaInformation() const { - return this->metaInformation; - } + [[nodiscard]] const std::shared_ptr &getMetaInformation() const { + return this->metaInformation; + } - [[nodiscard]] const std::shared_ptr &getPluginData() const { - return pluginData; - } + [[nodiscard]] const std::shared_ptr &getPluginData() const { + return pluginData; + } - const std::shared_ptr pluginData; - const std::shared_ptr metaInformation; -}; \ No newline at end of file + const std::shared_ptr pluginData; + const std::shared_ptr metaInformation; + }; +} // namespace WUPSBackend \ No newline at end of file diff --git a/include/wups_backend/PluginData.h b/include/wups_backend/PluginData.h index 2335b88..7941bd7 100644 --- a/include/wups_backend/PluginData.h +++ b/include/wups_backend/PluginData.h @@ -19,15 +19,17 @@ #include #include -class PluginData { +namespace WUPSBackend { + class PluginData { -public: - explicit PluginData(uint32_t handle); - ~PluginData(); + public: + explicit PluginData(uint32_t handle); + ~PluginData(); - [[nodiscard]] uint32_t getHandle() const { - return handle; - } + [[nodiscard]] uint32_t getHandle() const { + return handle; + } - uint32_t handle; -}; \ No newline at end of file + uint32_t handle; + }; +} // namespace WUPSBackend \ No newline at end of file diff --git a/include/wups_backend/PluginMetaInformation.h b/include/wups_backend/PluginMetaInformation.h index b78d490..37fec76 100644 --- a/include/wups_backend/PluginMetaInformation.h +++ b/include/wups_backend/PluginMetaInformation.h @@ -21,90 +21,92 @@ #include #include -class PluginMetaInformation { -public: - [[nodiscard]] const std::string &getName() const { - return name; - } +namespace WUPSBackend { + class PluginMetaInformation { + public: + [[nodiscard]] const std::string &getName() const { + return name; + } - [[nodiscard]] const std::string &getAuthor() const { - return this->author; - } + [[nodiscard]] const std::string &getAuthor() const { + return this->author; + } - [[nodiscard]] const std::string &getVersion() const { - return this->version; - } + [[nodiscard]] const std::string &getVersion() const { + return this->version; + } - [[nodiscard]] const std::string &getLicense() const { - return this->license; - } + [[nodiscard]] const std::string &getLicense() const { + return this->license; + } - [[nodiscard]] const std::string &getBuildTimestamp() const { - return this->buildtimestamp; - } + [[nodiscard]] const std::string &getBuildTimestamp() const { + return this->buildtimestamp; + } - [[nodiscard]] const std::string &getDescription() const { - return this->description; - } + [[nodiscard]] const std::string &getDescription() const { + return this->description; + } - [[nodiscard]] const std::string &getStorageId() const { - return this->storageId; - } + [[nodiscard]] const std::string &getStorageId() const { + return this->storageId; + } - [[nodiscard]] size_t getSize() const { - return this->size; - } + [[nodiscard]] size_t getSize() const { + return this->size; + } - PluginMetaInformation(std::string name, - std::string author, - std::string version, - std::string license, - std::string buildtimestamp, - std::string description, - std::string storageId, - size_t size); + PluginMetaInformation(std::string name, + std::string author, + std::string version, + std::string license, + std::string buildtimestamp, + std::string description, + std::string storageId, + size_t size); -private: - PluginMetaInformation() = default; + private: + PluginMetaInformation() = default; - void setName(std::string name_) { - this->name = std::move(name_); - } + void setName(std::string name_) { + this->name = std::move(name_); + } - void setAuthor(std::string author_) { - this->author = std::move(author_); - } + void setAuthor(std::string author_) { + this->author = std::move(author_); + } - void setVersion(std::string version_) { - this->version = std::move(version_); - } + void setVersion(std::string version_) { + this->version = std::move(version_); + } - void setLicense(std::string license_) { - this->license = std::move(license_); - } + void setLicense(std::string license_) { + this->license = std::move(license_); + } - void setBuildTimestamp(std::string buildtimestamp_) { - this->buildtimestamp = std::move(buildtimestamp_); - } + void setBuildTimestamp(std::string buildtimestamp_) { + this->buildtimestamp = std::move(buildtimestamp_); + } - void setDescription(std::string description_) { - this->description = std::move(description_); - } + void setDescription(std::string description_) { + this->description = std::move(description_); + } - void setStorageId(std::string storageId_) { - this->storageId = std::move(storageId_); - } + void setStorageId(std::string storageId_) { + this->storageId = std::move(storageId_); + } - void setSize(size_t size_) { - this->size = size_; - } + void setSize(size_t size_) { + this->size = size_; + } - std::string name; - std::string author; - std::string version; - std::string license; - std::string buildtimestamp; - std::string description; - std::string storageId; - size_t size{}; -}; + std::string name; + std::string author; + std::string version; + std::string license; + std::string buildtimestamp; + std::string description; + std::string storageId; + size_t size{}; + }; +} // namespace WUPSBackend \ No newline at end of file diff --git a/include/wups_backend/PluginUtils.h b/include/wups_backend/PluginUtils.h index 29e470a..b48f47d 100644 --- a/include/wups_backend/PluginUtils.h +++ b/include/wups_backend/PluginUtils.h @@ -20,17 +20,19 @@ #include "PluginMetaInformation.h" #include -class PluginUtils { -public: - static std::optional> getMetaInformationForBuffer(char *buffer, size_t size); +namespace WUPSBackend { + class PluginUtils { + public: + static std::optional> getMetaInformationForBuffer(char *buffer, size_t size); - static std::optional> getMetaInformationForPath(const std::string &path); + static std::optional> getMetaInformationForPath(const std::string &path); - static std::vector> getLoadedPlugins(uint32_t maxSize); + static std::vector> getLoadedPlugins(uint32_t maxSize); - static std::optional> getPluginForPath(const std::string &path); + static std::optional> getPluginForPath(const std::string &path); - static std::optional> getPluginForBuffer(char *buffer, size_t size); + static std::optional> getPluginForBuffer(char *buffer, size_t size); - static int32_t LoadAndLinkOnRestart(const std::vector> &plugins); -}; + static int32_t LoadAndLinkOnRestart(const std::vector> &plugins); + }; +} // namespace WUPSBackend \ No newline at end of file diff --git a/source/PluginData.cpp b/source/PluginData.cpp index 04b36e1..6c0acfa 100644 --- a/source/PluginData.cpp +++ b/source/PluginData.cpp @@ -20,6 +20,8 @@ #include "logger.h" #include +using namespace WUPSBackend; + PluginData::PluginData(uint32_t handle) { this->handle = handle; } @@ -30,4 +32,4 @@ PluginData::~PluginData() { DEBUG_FUNCTION_LINE_ERR("Failed to delete plugin data"); } } -} \ No newline at end of file +} diff --git a/source/PluginMetaInformation.cpp b/source/PluginMetaInformation.cpp index a28296f..97fb90a 100644 --- a/source/PluginMetaInformation.cpp +++ b/source/PluginMetaInformation.cpp @@ -18,9 +18,10 @@ #include "wups_backend/PluginMetaInformation.h" #include -#include #include +using namespace WUPSBackend; + PluginMetaInformation::PluginMetaInformation(std::string name, std::string author, std::string version, diff --git a/source/PluginUtils.cpp b/source/PluginUtils.cpp index d04a2e4..96974f7 100644 --- a/source/PluginUtils.cpp +++ b/source/PluginUtils.cpp @@ -22,6 +22,8 @@ #include #include +using namespace WUPSBackend; + std::optional> getMetaInformation(const plugin_information &info) { if (info.plugin_information_version != PLUGIN_INFORMATION_VERSION) { DEBUG_FUNCTION_LINE_ERR("Version mismatch");