OS: Templatize InterfacePtr for types from the loader module

Author: N3xoX1

src/nxemu-os/core/file_sys/filesystem_interfaces.cpp

@@ -1,280 +1,109 @@
 #include "filesystem_interfaces.h"
 #include <nxemu-module-spec/system_loader.h>
 
-IVirtualDirectoryPtr::IVirtualDirectoryPtr() :
-    m_directory(nullptr)
+template<typename InterfaceType>
+InterfacePtr<InterfaceType>::InterfacePtr() : 
+    m_ptr(nullptr) 
 {
 }
 
-IVirtualDirectoryPtr::IVirtualDirectoryPtr(IVirtualDirectory * ptr) :
-    m_directory(ptr)
+template<typename InterfaceType>
+InterfacePtr<InterfaceType>::InterfacePtr(InterfaceType* ptr) : 
+    m_ptr(ptr) 
 {
 }
 
-IVirtualDirectoryPtr::~IVirtualDirectoryPtr()
+template<typename InterfaceType>
+InterfacePtr<InterfaceType>::InterfacePtr(InterfacePtr&& other) noexcept
+    : m_ptr(other.m_ptr) 
 {
-    if (m_directory != nullptr)
-    {
-        m_directory->Release();
-    }
-    m_directory = nullptr;
+    other.m_ptr = nullptr;
 }
 
-IVirtualDirectoryPtr & IVirtualDirectoryPtr::operator=(IVirtualDirectory * ptr)
+template<typename InterfaceType>
+InterfacePtr<InterfaceType>::~InterfacePtr() 
 {
-    if (m_directory != nullptr)
+    if (m_ptr) 
     {
-        m_directory->Release();
+        m_ptr->Release();
+        m_ptr = nullptr;
     }
-    m_directory = ptr;
-    return *this;
 }
 
-IVirtualDirectoryPtr& IVirtualDirectoryPtr::operator=(IVirtualDirectoryPtr && other) noexcept
+template<typename InterfaceType>
+InterfacePtr<InterfaceType> & InterfacePtr<InterfaceType>::operator=(InterfaceType * ptr)
 {
-    if (this != &other)
+    if (m_ptr != ptr && m_ptr != nullptr)
     {
-        if (m_directory)
-        {
-            m_directory->Release();
-        }
-        m_directory = other.m_directory;
-        other.m_directory = nullptr;
+        m_ptr->Release();
     }
+    m_ptr = ptr;
     return *this;
 }
 
-IVirtualDirectory ** IVirtualDirectoryPtr::GetAddressForSet()
-{
-    if (m_directory)
-    {
-        m_directory->Release();
-        m_directory = nullptr;
-    }
-    return &m_directory;
-}
-
-IVirtualDirectory * IVirtualDirectoryPtr::operator->() const
-{
-    return m_directory;
-}
-
-IVirtualDirectory & IVirtualDirectoryPtr::operator*() const
-{
-    return *m_directory;
-}
-
-IVirtualDirectoryPtr::operator bool() const
-{
-    return m_directory != nullptr;
-}
-
-IVirtualFilePtr::IVirtualFilePtr() :
-    m_file(nullptr)
-{
-}
-
-IVirtualFilePtr::IVirtualFilePtr(IVirtualFile * file) :
-    m_file(file)
-{
-}
-
-IVirtualFilePtr::IVirtualFilePtr(IVirtualFilePtr && other) noexcept
-{
-    m_file = other.m_file;
-    other.m_file = nullptr;
-}
-
-IVirtualFilePtr::~IVirtualFilePtr()
-{
-    if (m_file != nullptr)
-    {
-        m_file->Release();
-    }
-    m_file = nullptr;
-}
-
-IVirtualFilePtr & IVirtualFilePtr::operator=(IVirtualFile * ptr)
+template<typename InterfaceType>
+InterfacePtr<InterfaceType>& InterfacePtr<InterfaceType>::operator=(InterfacePtr&& other) noexcept 
 {
-    if (m_file != ptr && m_file != nullptr)
+    if (this != &other) 
     {
-        m_file->Release();
+        if (m_ptr) {
+            m_ptr->Release();
+        }
+        m_ptr = other.m_ptr;
+        other.m_ptr = nullptr;
     }
-    m_file = ptr;
     return *this;
 }
 
-IVirtualFilePtr & IVirtualFilePtr::operator=(IVirtualFilePtr && other) noexcept
+template<typename InterfaceType>
+InterfaceType** InterfacePtr<InterfaceType>::GetAddressForSet() 
 {
-    if (m_file != nullptr)
+    if (m_ptr) 
     {
-        m_file->Release();
+        m_ptr->Release();
+        m_ptr = nullptr;
     }
-    m_file = other.m_file;
-    other.m_file = nullptr;
-    return *this;
+    return &m_ptr;
 }
 
-IVirtualFile * IVirtualFilePtr::operator->() const
+template<typename InterfaceType>
+InterfaceType* InterfacePtr<InterfaceType>::operator->() const 
 {
-    return m_file;
+    return m_ptr;
 }
 
-IVirtualFile & IVirtualFilePtr::operator*() const
+template<typename InterfaceType>
+InterfaceType& InterfacePtr<InterfaceType>::operator*() const 
 {
-    return *m_file;
+    return *m_ptr;
 }
 
-IVirtualFilePtr::operator bool() const
+template<typename InterfaceType>
+InterfacePtr<InterfaceType>::operator bool() const 
 {
-    return m_file != nullptr;
+    return m_ptr != nullptr;
 }
 
 std::vector<uint8_t> IVirtualFilePtr::ReadAllBytes() const
 {
-    uint64_t dataSize = m_file->GetSize();
+    uint64_t dataSize = m_ptr->GetSize();
     if (dataSize == 0)
     {
         return {};
     }
     std::vector<uint8_t> data;
     data.resize(dataSize);
-    dataSize = m_file->ReadBytes(data.data(), data.size(), 0);
+    dataSize = m_ptr->ReadBytes(data.data(), data.size(), 0);
     if (dataSize < data.size())
     {
         data.resize(dataSize);
     }
     return data;
 }
 
-FileSysNCAPtr::FileSysNCAPtr() :
-    m_ptr(nullptr)
-{
-}
-
-FileSysNCAPtr::FileSysNCAPtr(IFileSysNCA* ptr) :
-    m_ptr(ptr) 
-{
-}
-
-FileSysNCAPtr::FileSysNCAPtr(FileSysNCAPtr&& other) noexcept : 
-    m_ptr(other.m_ptr) 
-{
-    other.m_ptr = nullptr;
-}
-
-FileSysNCAPtr::~FileSysNCAPtr() 
-{
-    if (m_ptr)
-    {
-        m_ptr->Release();
-        m_ptr = nullptr;
-    }
-}
-
-FileSysNCAPtr& FileSysNCAPtr::operator=(FileSysNCAPtr&& other) noexcept 
-{
-    if (this != &other) 
-    {
-        if (m_ptr)
-        {
-            m_ptr->Release();
-        }
-        m_ptr = other.m_ptr;
-        other.m_ptr = nullptr;
-    }
-    return *this;
-}
-
-IFileSysNCA* FileSysNCAPtr::operator->() const 
-{
-    return m_ptr;
-}
-
-IFileSysNCA& FileSysNCAPtr::operator*() const 
-{
-    return *m_ptr;
-}
-
-FileSysNCAPtr::operator bool() const 
-{
-    return m_ptr != nullptr;
-}
-
-SaveDataFactoryPtr::SaveDataFactoryPtr() :
-    m_ptr(nullptr)
-{
-}
-
-SaveDataFactoryPtr::SaveDataFactoryPtr(SaveDataFactoryPtr && other) noexcept
-{
-    m_ptr = other.m_ptr;
-    other.m_ptr = nullptr;
-}
-
-SaveDataFactoryPtr::~SaveDataFactoryPtr()
-{
-    if (m_ptr)
-    {
-        m_ptr->Release();
-        m_ptr = nullptr;
-    }
-}
-
-SaveDataFactoryPtr & SaveDataFactoryPtr::operator=(SaveDataFactoryPtr&& other) noexcept
-{
-    if (m_ptr)
-    {
-        m_ptr->Release();
-        m_ptr = nullptr;
-    }
-    m_ptr = other.m_ptr;
-    other.m_ptr = nullptr;
-    return *this;
-}
-
-ISaveDataFactory ** SaveDataFactoryPtr::GetAddressForSet()
-{
-    if (m_ptr) 
-    {
-        m_ptr->Release();
-        m_ptr = nullptr;
-    }
-    return &m_ptr;
-}
-
-RomFsControllerPtr::RomFsControllerPtr() :
-    m_ptr(nullptr)
-{
-}
-
-RomFsControllerPtr::RomFsControllerPtr(RomFsControllerPtr && other) noexcept
-{
-    m_ptr = other.m_ptr;
-    other.m_ptr = nullptr;
-}
-
-
-RomFsControllerPtr::~RomFsControllerPtr()
-{
-    if (m_ptr)
-    {
-        m_ptr->Release();
-        m_ptr = nullptr;
-    }
-}
-
-IRomFsController ** RomFsControllerPtr::GetAddressForSet()
-{
-    if (m_ptr)
-    {
-        m_ptr->Release();
-        m_ptr = nullptr;
-    }
-    return &m_ptr;
-}
-
-IRomFsController * RomFsControllerPtr::operator->() const
-{
-    return m_ptr;
-}
+template class InterfacePtr<IVirtualDirectory>;
+template class InterfacePtr<IVirtualFile>;
+template class InterfacePtr<IFileSysNCA>;
+template class InterfacePtr<ISaveDataFactory>;
+template class InterfacePtr<IRomFsController>;
+template class InterfacePtr<IFileSysNACP>;