Skip to content

Commit e318999

Browse files
committed
Fix after rebasing.
1 parent 1327bf1 commit e318999

File tree

5 files changed

+5
-24
lines changed

5 files changed

+5
-24
lines changed

src/mobase/wrappers/basic_classes.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
#include <format>
66

77
#include <executableinfo.h>
8+
#include <extension.h>
89
#include <filemapping.h>
910
#include <guessedvalue.h>
1011
#include <idownloadmanager.h>
12+
#include <iextensionlist.h>
1113
#include <igamefeatures.h>
1214
#include <iinstallationmanager.h>
1315
#include <imodinterface.h>
@@ -517,6 +519,8 @@ namespace mo2::python {
517519
py::return_value_policy::reference)
518520
.def("pluginList", &IOrganizer::pluginList,
519521
py::return_value_policy::reference)
522+
.def("extensionList", &IOrganizer::extensionList,
523+
py::return_value_policy::reference)
520524
.def("modList", &IOrganizer::modList, py::return_value_policy::reference)
521525
.def("gameFeatures", &IOrganizer::gameFeatures,
522526
py::return_value_policy::reference)

src/mobase/wrappers/pyplugins.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,6 @@ namespace mo2::python {
144144
.def("init", &IPlugin::init, "organizer"_a)
145145
.def("name", &IPlugin::name)
146146
.def("localizedName", &IPlugin::localizedName)
147-
.def("master", &IPlugin::master)
148-
.def("author", &IPlugin::author)
149-
.def("description", &IPlugin::description)
150-
.def("version", &IPlugin::version)
151-
.def("requirements", &IPlugin::requirements)
152147
.def("settings", &IPlugin::settings)
153148
.def("enabledByDefault", &IPlugin::enabledByDefault);
154149

src/mobase/wrappers/pyplugins.h

-16
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,6 @@ namespace mo2::python {
4545
{
4646
PYBIND11_OVERRIDE(QString, PluginBase, localizedName, );
4747
}
48-
QString master() const override
49-
{
50-
PYBIND11_OVERRIDE(QString, PluginBase, master, );
51-
}
52-
QString author() const override
53-
{
54-
PYBIND11_OVERRIDE_PURE(QString, PluginBase, author, );
55-
}
56-
QString description() const override
57-
{
58-
PYBIND11_OVERRIDE_PURE(QString, PluginBase, description, );
59-
}
60-
VersionInfo version() const override
61-
{
62-
PYBIND11_OVERRIDE_PURE(VersionInfo, PluginBase, version, );
63-
}
6448
QList<PluginSetting> settings() const override
6549
{
6650
PYBIND11_OVERRIDE_PURE(QList<PluginSetting>, PluginBase, settings, );

tests/mocks/MockOrganizer.h

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class MockOrganizer : public IOrganizer {
3434
MOCK_METHOD(std::shared_ptr<const IFileTree>, virtualFileTree, (), (const, override));
3535
MOCK_METHOD(MOBase::IDownloadManager*, downloadManager, (), (const, override));
3636
MOCK_METHOD(MOBase::IPluginList*, pluginList, (), (const, override));
37+
MOCK_METHOD(MOBase::IExtensionList&, extensionList, (), (const, override));
3738
MOCK_METHOD(MOBase::IModList*, modList, (), (const, override));
3839
MOCK_METHOD(MOBase::IProfile*, profile, (), (const, override));
3940
MOCK_METHOD(MOBase::IGameFeatures*, gameFeatures, (), (const, override));

tests/runner/test_iplugin.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ TEST(IPlugin, Basic)
2525
const IPlugin* plugin = qobject_cast<IPlugin*>(objects[0][0]);
2626
EXPECT_NE(plugin, nullptr);
2727

28-
EXPECT_EQ(plugin->author(), "The Author");
2928
EXPECT_EQ(plugin->name(), "The Name");
30-
EXPECT_EQ(plugin->version(), VersionInfo(1, 3, 0));
31-
EXPECT_EQ(plugin->description(), "The Description");
3229

3330
// settings
3431
const auto settings = plugin->settings();

0 commit comments

Comments
 (0)