mo2/modorganizer-plugin_python
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-plugin_python.git synced 2026-07-27 14:03:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

removed unused IOrganizer from PythonRunner

Browse Source
This commit is contained in:
isanae
2020-11-06 09:25:01 -05:00
parent 78e4e5c548
commit 86297b1170
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/proxy/proxypython.cpp
+2 -2
View File
@@ -110,7 +110,7 @@ ProxyPython::~ProxyPython()
}
}
typedef IPythonRunner* (*CreatePythonRunner_func)(const MOBase::IOrganizer *moInfo, const QString &pythonPath);
typedef IPythonRunner* (*CreatePythonRunner_func)(const QString &pythonPath);
bool ProxyPython::init(IOrganizer *moInfo)
@@ -170,7 +170,7 @@ bool ProxyPython::init(IOrganizer *moInfo)
m_MOInfo->setPersistent(name(), "tryInit", true);
}
m_Runner = CreatePythonRunner(moInfo, pythonPath);
m_Runner = CreatePythonRunner(pythonPath);
if (m_MOInfo) {
m_MOInfo->setPersistent(name(), "tryInit", false);
src/runner/pythonrunner.cpp
+4 -6
View File
@@ -1035,7 +1035,7 @@ class PythonRunner : public IPythonRunner
{
public:
PythonRunner(const MOBase::IOrganizer* moInfo);
PythonRunner();
bool initPython(const QString& pythonDir);
QList<QObject*> instantiate(const QString& pluginName);
bool isPythonInstalled() const;
@@ -1066,13 +1066,12 @@ private:
// List of python objects representing plugins to keep all the bpy::object "alive"
// during the execution.
std::vector<bpy::object> m_PythonObjects;
const MOBase::IOrganizer* m_MOInfo;
wchar_t* m_PythonHome;
};
IPythonRunner* CreatePythonRunner(MOBase::IOrganizer* moInfo, const QString& pythonDir)
IPythonRunner* CreatePythonRunner(const QString& pythonDir)
{
PythonRunner* result = new PythonRunner(moInfo);
PythonRunner* result = new PythonRunner;
if (result->initPython(pythonDir)) {
return result;
}
@@ -1082,8 +1081,7 @@ IPythonRunner* CreatePythonRunner(MOBase::IOrganizer* moInfo, const QString& pyt
}
}
PythonRunner::PythonRunner(const MOBase::IOrganizer *moInfo)
: m_MOInfo(moInfo)
PythonRunner::PythonRunner()
{
m_PythonHome = new wchar_t[MAX_PATH + 1];
}
src/runner/pythonrunner.h
+1 -1
View File
@@ -22,7 +22,7 @@ public:
#define PYDLLEXPORT Q_DECL_IMPORT
#endif // PYTHONRUNNER_LIBRARY
extern "C" PYDLLEXPORT IPythonRunner *CreatePythonRunner(MOBase::IOrganizer *moInfo, const QString &pythonDir);
extern "C" PYDLLEXPORT IPythonRunner *CreatePythonRunner(const QString &pythonDir);