7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-02-17 00:30:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove friend ModInfo::Impl (created a warning)

Browse source
This commit is contained in:
altalk23 2023-08-14 17:03:40 +03:00
parent aee84c0ffc
commit 86accf9a33
7 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
loader/include/Geode/loader/ModMetadata.hpp
View file

@ -240,8 +240,6 @@ namespace geode {
friend class Loader;
friend class ModMetadataImpl;
friend class ModInfo;
};
}

2
loader/src/loader/LoaderImpl.hpp
View file

@ -182,7 +182,7 @@ namespace geode {
bool userTriedToLoadDLLs() const;
};
class LoaderImpl {
class LoaderImpl : public Loader::Impl {
public:
static Loader::Impl* get();
};

2
loader/src/loader/ModImpl.hpp
View file

@ -134,7 +134,7 @@ namespace geode {
ModJson getRuntimeInfo() const;
};
class ModImpl : public Mod {
class ModImpl : public Mod::Impl {
public:
static Mod::Impl* get();

10
loader/src/loader/ModInfoImpl.cpp
View file

@ -157,19 +157,19 @@ bool const& ModInfo::isAPI() const {
}
Result<ModInfo> ModInfo::createFromGeodeZip(utils::file::Unzip& zip) {
return ModMetadata::Impl::createFromGeodeZip(zip);
return ModMetadataImpl::createFromGeodeZip(zip);
}
Result<ModInfo> ModInfo::createFromGeodeFile(ghc::filesystem::path const& path) {
return ModMetadata::Impl::createFromGeodeFile(path);
return ModMetadataImpl::createFromGeodeFile(path);
}
Result<ModInfo> ModInfo::createFromFile(ghc::filesystem::path const& path) {
return ModMetadata::Impl::createFromFile(path);
return ModMetadataImpl::createFromFile(path);
}
Result<ModInfo> ModInfo::create(ModJson const& json) {
return ModMetadata::Impl::create(json);
return ModMetadataImpl::create(json);
}
ModJson ModInfo::toJSON() const {
@ -227,7 +227,7 @@ ModJson const& ModInfo::rawJSON() const {
}
Result<ModInfo> ModInfo::createFromSchemaV010(geode::ModJson const& json) {
return ModMetadata::Impl::createFromSchemaV010(json);
return ModMetadataImpl::createFromSchemaV010(json);
}
Result<> ModInfo::addSpecialFiles(ghc::filesystem::path const& dir) {

4
loader/src/loader/ModInfoImpl.hpp
View file

@ -14,7 +14,7 @@ using namespace geode::prelude;
namespace geode {
class [[deprecated]] ModInfo::Impl {
public:
ModMetadata::Impl m_metadata;
ModMetadataImpl m_metadata;
std::optional<IssuesInfo> m_issues;
std::vector<Dependency> m_dependencies;
bool m_supportsDisabling = true;
@ -23,7 +23,7 @@ namespace geode {
bool operator==(ModInfo::Impl const& other) const;
};
class [[deprecated]] ModInfoImpl {
class [[deprecated]] ModInfoImpl : public ModInfo::Impl {
public:
static ModInfo::Impl& getImpl(ModInfo& info);
};

4
loader/src/loader/ModMetadataImpl.cpp
View file

@ -549,7 +549,7 @@ ModMetadata& ModMetadata::operator=(ModMetadata&& other) noexcept {
ModMetadata::operator ModInfo() {
ModInfo info;
auto infoImpl = ModInfoImpl::getImpl(info);
infoImpl.m_metadata = *m_impl;
infoImpl.m_metadata.Impl::operator=(*m_impl); // im gonna cry what is this hack why are you not using pointers
infoImpl.m_issues = m_impl->m_issues;
for (auto& dep : m_impl->m_dependencies)
infoImpl.m_dependencies.push_back(dep);
@ -558,7 +558,7 @@ ModMetadata::operator ModInfo() {
ModMetadata::operator ModInfo() const {
ModInfo info;
auto infoImpl = ModInfoImpl::getImpl(info);
infoImpl.m_metadata = *m_impl;
infoImpl.m_metadata.Impl::operator=(*m_impl);
infoImpl.m_issues = m_impl->m_issues;
for (auto& dep : m_impl->m_dependencies)
infoImpl.m_dependencies.push_back(dep);

2
loader/src/loader/ModMetadataImpl.hpp
View file

@ -51,7 +51,7 @@ namespace geode {
std::vector<std::pair<std::string, std::optional<std::string>*>> getSpecialFiles();
};
class ModMetadataImpl {
class ModMetadataImpl : public ModMetadata::Impl {
public:
static ModMetadata::Impl& getImpl(ModMetadata& info);
};