Skip to content

Commit

Permalink
adapt :adapt to GMLIB v0.13.2
Browse files Browse the repository at this point in the history
adapt :adapt to GMLIB v0.13.2
  • Loading branch information
killcerr authored Jul 27, 2024
2 parents 31a11ec + f1c77c2 commit 7a44804
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: branch@master
xmake-version: latest
- run: |
xmake repo -u
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: branch@master
xmake-version: latest
- run: |
xmake repo -u
Expand Down
4 changes: 2 additions & 2 deletions src/Entry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ LangI18n& Entry::getI18n() { return mI18n.value(); }

} // namespace FreeCamera

LL_REGISTER_PLUGIN(FreeCamera::Entry, FreeCamera::Entry::getInstance());
LL_REGISTER_MOD(FreeCamera::Entry, FreeCamera::Entry::getInstance());

std::string tr(std::string const& key, std::vector<std::string> const& data) {
return FreeCamera::Entry::getInstance()->getI18n().get(key, data);
}
}
10 changes: 5 additions & 5 deletions src/Entry.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ class Entry {
public:
static std::unique_ptr<Entry>& getInstance();

Entry(ll::plugin::NativePlugin& self) : mSelf(self) {}
Entry(ll::mod::NativeMod& self) : mSelf(self) {}

[[nodiscard]] ll::plugin::NativePlugin& getSelf() const { return mSelf; }
[[nodiscard]] ll::mod::NativeMod& getSelf() const { return mSelf; }

/// @return True if the plugin is loaded successfully.
bool load();
Expand All @@ -31,9 +31,9 @@ class Entry {
LangI18n& getI18n();

private:
ll::plugin::NativePlugin& mSelf;
std::optional<Config> mConfig;
std::optional<LangI18n> mI18n;
ll::mod::NativeMod& mSelf;
std::optional<Config> mConfig;
std::optional<LangI18n> mI18n;
};

} // namespace FreeCamera

0 comments on commit 7a44804

Please sign in to comment.