Skip to content

Commit a644546

Browse files
authored
Merge pull request #115 from ModOrganizer2/uibase_updates
Use defaults set in UIBase
2 parents 0be763f + 404fd3f commit a644546

1 file changed

Lines changed: 15 additions & 17 deletions

File tree

src/mobase/wrappers/pyplugins.h

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,7 @@ namespace mo2::python {
384384
QMap<QString, QDir> secondaryDataDirectories() const override
385385
{
386386
using string_dir_map = QMap<QString, QDir>;
387-
PYBIND11_OVERRIDE_PURE(string_dir_map, IPluginGame,
388-
secondaryDataDirectories, );
387+
PYBIND11_OVERRIDE(string_dir_map, IPluginGame, secondaryDataDirectories, );
389388
}
390389
void setGamePath(const QString& path) override
391390
{
@@ -401,7 +400,7 @@ namespace mo2::python {
401400
}
402401
QList<ExecutableInfo> executables() const override
403402
{
404-
PYBIND11_OVERRIDE_PURE(QList<ExecutableInfo>, IPluginGame, executables, );
403+
PYBIND11_OVERRIDE(QList<ExecutableInfo>, IPluginGame, executables, );
405404
}
406405
QList<ExecutableForcedLoadSetting> executableForcedLoads() const override
407406
{
@@ -410,19 +409,19 @@ namespace mo2::python {
410409
}
411410
QString steamAPPId() const override
412411
{
413-
PYBIND11_OVERRIDE_PURE(QString, IPluginGame, steamAPPId, );
412+
PYBIND11_OVERRIDE(QString, IPluginGame, steamAPPId, );
414413
}
415414
QStringList primaryPlugins() const override
416415
{
417-
PYBIND11_OVERRIDE_PURE(QStringList, IPluginGame, primaryPlugins, );
416+
PYBIND11_OVERRIDE(QStringList, IPluginGame, primaryPlugins, );
418417
}
419418
QStringList enabledPlugins() const override
420419
{
421-
PYBIND11_OVERRIDE_PURE(QStringList, IPluginGame, enabledPlugins, );
420+
PYBIND11_OVERRIDE(QStringList, IPluginGame, enabledPlugins, );
422421
}
423422
QStringList gameVariants() const override
424423
{
425-
PYBIND11_OVERRIDE_PURE(QStringList, IPluginGame, gameVariants, );
424+
PYBIND11_OVERRIDE(QStringList, IPluginGame, gameVariants, );
426425
}
427426
void setGameVariant(const QString& variant) override
428427
{
@@ -438,40 +437,39 @@ namespace mo2::python {
438437
}
439438
QStringList primarySources() const override
440439
{
441-
PYBIND11_OVERRIDE_PURE(QStringList, IPluginGame, primarySources, );
440+
PYBIND11_OVERRIDE(QStringList, IPluginGame, primarySources, );
442441
}
443442
QStringList validShortNames() const override
444443
{
445-
PYBIND11_OVERRIDE_PURE(QStringList, IPluginGame, validShortNames, );
444+
PYBIND11_OVERRIDE(QStringList, IPluginGame, validShortNames, );
446445
}
447446
QString gameNexusName() const override
448447
{
449-
PYBIND11_OVERRIDE_PURE(QString, IPluginGame, gameNexusName, );
448+
PYBIND11_OVERRIDE(QString, IPluginGame, gameNexusName, );
450449
}
451450
QStringList iniFiles() const override
452451
{
453-
PYBIND11_OVERRIDE_PURE(QStringList, IPluginGame, iniFiles, );
452+
PYBIND11_OVERRIDE(QStringList, IPluginGame, iniFiles, );
454453
}
455454
QStringList DLCPlugins() const override
456455
{
457-
PYBIND11_OVERRIDE_PURE(QStringList, IPluginGame, DLCPlugins, );
456+
PYBIND11_OVERRIDE(QStringList, IPluginGame, DLCPlugins, );
458457
}
459458
QStringList CCPlugins() const override
460459
{
461-
PYBIND11_OVERRIDE_PURE(QStringList, IPluginGame, CCPlugins, );
460+
PYBIND11_OVERRIDE(QStringList, IPluginGame, CCPlugins, );
462461
}
463462
LoadOrderMechanism loadOrderMechanism() const override
464463
{
465-
PYBIND11_OVERRIDE_PURE(LoadOrderMechanism, IPluginGame,
466-
loadOrderMechanism, );
464+
PYBIND11_OVERRIDE(LoadOrderMechanism, IPluginGame, loadOrderMechanism, );
467465
}
468466
SortMechanism sortMechanism() const override
469467
{
470-
PYBIND11_OVERRIDE_PURE(SortMechanism, IPluginGame, sortMechanism, );
468+
PYBIND11_OVERRIDE(SortMechanism, IPluginGame, sortMechanism, );
471469
}
472470
int nexusModOrganizerID() const override
473471
{
474-
PYBIND11_OVERRIDE_PURE(int, IPluginGame, nexusModOrganizerID, );
472+
PYBIND11_OVERRIDE(int, IPluginGame, nexusModOrganizerID, );
475473
}
476474
int nexusGameID() const override
477475
{

0 commit comments

Comments
 (0)