From aca861194dad765a4d6b320533e654a3b3a6d9ee Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 11 Apr 2018 17:10:55 +0100 Subject: [PATCH 1/3] Update .gitignore with msbuild stuff --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 8e59a94..17f181e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ CMakeLists.txt.user edit build +vsbuild std*.log +vs_std*.log +msbuild.log *.bak From e08b8be5708b44d9a99f20f3045536db6a0a4f8a Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 11 Apr 2018 17:12:27 +0100 Subject: [PATCH 2/3] Remove dead code --- src/proxy/proxypluginwrappers.cpp | 213 ----------------------------- src/proxy/proxypluginwrappers.h | 80 ----------- src/proxy/pythonpluginwrapper.cpp | 112 --------------- src/proxy/pythonpluginwrapper.h | 44 ------ src/proxy/pythontoolwrapper.cpp | 80 ----------- src/proxy/pythontoolwrapper.h | 56 -------- src/runner/pythonpluginwrapper.cpp | 111 --------------- src/runner/pythonpluginwrapper.h | 45 ------ src/runner/pythontoolwrapper.cpp | 80 ----------- src/runner/pythontoolwrapper.h | 55 -------- 10 files changed, 876 deletions(-) delete mode 100644 src/proxy/proxypluginwrappers.cpp delete mode 100644 src/proxy/proxypluginwrappers.h delete mode 100644 src/proxy/pythonpluginwrapper.cpp delete mode 100644 src/proxy/pythonpluginwrapper.h delete mode 100644 src/proxy/pythontoolwrapper.cpp delete mode 100644 src/proxy/pythontoolwrapper.h delete mode 100644 src/runner/pythonpluginwrapper.cpp delete mode 100644 src/runner/pythonpluginwrapper.h delete mode 100644 src/runner/pythontoolwrapper.cpp delete mode 100644 src/runner/pythontoolwrapper.h diff --git a/src/proxy/proxypluginwrappers.cpp b/src/proxy/proxypluginwrappers.cpp deleted file mode 100644 index b9db93b..0000000 --- a/src/proxy/proxypluginwrappers.cpp +++ /dev/null @@ -1,213 +0,0 @@ -#include "proxypluginwrappers.h" -#include -#include -//#include "error.h" -#include "gilock.h" - -namespace bpy = boost::python; - -using namespace MOBase; - - -#define PYCATCH catch (const bpy::error_already_set &) { reportPythonError(); throw MyException("unhandled exception"); }\ - catch (...) { throw MyException("An unknown exception was thrown in python code"); } - - -///////////////////////////// -/// IPluginTool Wrapper - - -bool IPluginToolWrapper::init(MOBase::IOrganizer *moInfo) -{ - try { - return this->get_override("init")(bpy::ptr(moInfo)); - } PYCATCH; -} - -QString IPluginToolWrapper::name() const -{ - try { - return this->get_override("name")(); - } PYCATCH; -} - -QString IPluginToolWrapper::author() const -{ - try { - return this->get_override("author")(); - } PYCATCH; -} - -QString IPluginToolWrapper::description() const -{ - try { - return this->get_override("description")(); - } PYCATCH; -} - -MOBase::VersionInfo IPluginToolWrapper::version() const -{ - try { - return this->get_override("version")(); - } PYCATCH; -} - -bool IPluginToolWrapper::isActive() const -{ - try { - return this->get_override("isActive")(); - } PYCATCH; -} - -QList IPluginToolWrapper::settings() const -{ - try { - return this->get_override("settings")(); - } PYCATCH; -} - -QString IPluginToolWrapper::displayName() const -{ - try { - return this->get_override("displayName")(); - } PYCATCH; -} - -QString IPluginToolWrapper::tooltip() const -{ - try { - return this->get_override("tooltip")(); - } PYCATCH; -} - -QIcon IPluginToolWrapper::icon() const -{ - try { - return this->get_override("icon")(); - } PYCATCH; -} - -void IPluginToolWrapper::setParentWidget(QWidget *parent) -{ - try { - this->get_override("setParentWidget")(parent); - } PYCATCH; -} - -void IPluginToolWrapper::display() const -{ - try { - GILock lock; - - this->get_override("display")(); - } PYCATCH; -} - -/// end IPluginTool Wrapper -///////////////////////////////////// -/// IPluginInstallerCustom Wrapper - - -bool IPluginInstallerCustomWrapper::init(MOBase::IOrganizer *moInfo) -{ - try { - return this->get_override("init")(bpy::ptr(moInfo)); - } PYCATCH; -} - -QString IPluginInstallerCustomWrapper::name() const -{ - try { - return this->get_override("name")(); - } PYCATCH; -} - -QString IPluginInstallerCustomWrapper::author() const -{ - try { - return this->get_override("author")(); - } PYCATCH; -} - -QString IPluginInstallerCustomWrapper::description() const -{ - try { - return this->get_override("description")(); - } PYCATCH; -} - -MOBase::VersionInfo IPluginInstallerCustomWrapper::version() const -{ - try { - return this->get_override("version")(); - } PYCATCH; -} - -bool IPluginInstallerCustomWrapper::isActive() const -{ - try { - return this->get_override("isActive")(); - } PYCATCH; -} - -QList IPluginInstallerCustomWrapper::settings() const -{ - try { - return this->get_override("settings")(); - } PYCATCH; -} - -unsigned int IPluginInstallerCustomWrapper::priority() const -{ - try { - return this->get_override("priority")(); - } PYCATCH; -} - -bool IPluginInstallerCustomWrapper::isManualInstaller() const -{ - try { - return this->get_override("isManualInstaller")(); - } PYCATCH; -} - -bool IPluginInstallerCustomWrapper::isArchiveSupported(const DirectoryTree &tree) const -{ - try { - //return this->get_override("isArchiveSupported")(tree); - return false; - } PYCATCH; -} - -bool IPluginInstallerCustomWrapper::isArchiveSupported(const QString &archiveName) const -{ - try { - return this->get_override("isArchiveSupported")(archiveName); - } PYCATCH; -} - -std::set IPluginInstallerCustomWrapper::supportedExtensions() const -{ - try { - return this->get_override("supportedExtensions")(); - } PYCATCH; -} - - -IPluginInstaller::EInstallResult IPluginInstallerCustomWrapper::install(GuessedValue &modName, const QString &archiveName, - const QString &version, int modID) -{ - try { - return this->get_override("install")(modName, archiveName, version, modID); - } PYCATCH; -} - - -void IPluginInstallerCustomWrapper::setParentWidget(QWidget *parent) -{ - try { - this->get_override("setParentWidget")(parent); - } PYCATCH; -} - - diff --git a/src/proxy/proxypluginwrappers.h b/src/proxy/proxypluginwrappers.h deleted file mode 100644 index 49e87df..0000000 --- a/src/proxy/proxypluginwrappers.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef PROXYPLUGINWRAPPERS_H -#define PROXYPLUGINWRAPPERS_H - - -#include -#include -#include -#include - -#ifndef Q_MOC_RUN -#include -#endif - - -class IPluginWrapper : public boost::python::wrapper -{ -public: - virtual bool init(MOBase::IOrganizer *moInfo); - virtual QString name() const; - virtual QString author() const; - virtual QString description() const; - virtual MOBase::VersionInfo version() const; - virtual bool isActive() const; - virtual QList settings() const; -}; - - -class IPluginToolWrapper: public MOBase::IPluginTool, public boost::python::wrapper -{ - Q_OBJECT - Q_INTERFACES(MOBase::IPlugin MOBase::IPluginTool) - -public: - virtual bool init(MOBase::IOrganizer *moInfo); - virtual QString name() const; - virtual QString author() const; - virtual QString description() const; - virtual MOBase::VersionInfo version() const; - virtual bool isActive() const; - virtual QList settings() const; - - virtual QString displayName() const; - virtual QString tooltip() const; - virtual QIcon icon() const; - virtual void setParentWidget(QWidget *parent); - -public slots: - virtual void display() const; -}; - - -class IPluginInstallerCustomWrapper: public MOBase::IPluginInstallerCustom, public boost::python::wrapper -{ - Q_OBJECT - Q_INTERFACES(MOBase::IPlugin MOBase::IPluginInstaller MOBase::IPluginInstallerCustom) - -public: - virtual bool init(MOBase::IOrganizer *moInfo); - virtual QString name() const; - virtual QString author() const; - virtual QString description() const; - virtual MOBase::VersionInfo version() const; - virtual bool isActive() const; - virtual QList settings() const; - - virtual unsigned int priority() const; - virtual bool isManualInstaller() const; - virtual bool isArchiveSupported(const MOBase::DirectoryTree &tree) const; - virtual bool isArchiveSupported(const QString &archiveName) const; - virtual std::set supportedExtensions() const; - virtual EInstallResult install(MOBase::GuessedValue &modName, const QString &archiveName, - const QString &version, int modID); - virtual void setParentWidget(QWidget *parent); - -}; - - - - -#endif // PROXYPLUGINWRAPPERS_H diff --git a/src/proxy/pythonpluginwrapper.cpp b/src/proxy/pythonpluginwrapper.cpp deleted file mode 100644 index 2208f46..0000000 --- a/src/proxy/pythonpluginwrapper.cpp +++ /dev/null @@ -1,112 +0,0 @@ -#include "pythonpluginwrapper.h" - - -using boost::python::extract; -using boost::python::handle_exception; - - -PythonPluginWrapper::PythonPluginWrapper(const boost::python::object &initFunction, - const boost::python::object &nameFunction, - const boost::python::object &authorFunction, - const boost::python::object &descriptionFunction, - const boost::python::object &versionFunction, - const boost::python::object &isActiveFunction, - const boost::python::object &settingsFunction) - : m_InitFunction(initFunction) - , m_NameFunction(nameFunction) - , m_AuthorFunction(authorFunction) - , m_DescriptionFunction(descriptionFunction) - , m_VersionFunction(versionFunction) - , m_IsActiveFunction(isActiveFunction) - , m_SettingsFunction(settingsFunction) -{ -} - - -void PythonPluginWrapper::reportPythonError() const -{ - if (PyErr_Occurred()) { - PyErr_Print(); - } else { - qCritical("An unexpected C++ exception was thrown in python code"); - } -} - - -bool PythonPluginWrapper::init(MOBase::IOrganizer *moInfo) -{ - try { - return boost::python::extract(m_InitFunction(boost::python::ptr(moInfo))); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return false; - } -} - -QString PythonPluginWrapper::name() const -{ - try { - return boost::python::extract(m_NameFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QString(); - } -} - -QString PythonPluginWrapper::author() const -{ - try { - return boost::python::extract(m_AuthorFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QString(); - } -} - -QString PythonPluginWrapper::description() const -{ - try { - return boost::python::extract(m_DescriptionFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QString(); - } -} - -MOBase::VersionInfo PythonPluginWrapper::version() const -{ - try { - return boost::python::extract(m_VersionFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return MOBase::VersionInfo(); - } -} - -bool PythonPluginWrapper::isActive() const -{ - try { - return boost::python::extract(m_IsActiveFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return false; - } -} - -QList PythonPluginWrapper::settings() const -{ - QList result; - try { - boost::python::object l = m_SettingsFunction(); - if (!l.is_none()) { -// boost::python::list l = extract(temp); - for (int i = 0; i < boost::python::len(l); ++i) { - result.append(extract(l[i])); - } - } - } catch (const boost::python::error_already_set&) { - reportPythonError(); - } - - return result; -} diff --git a/src/proxy/pythonpluginwrapper.h b/src/proxy/pythonpluginwrapper.h deleted file mode 100644 index 19c93a9..0000000 --- a/src/proxy/pythonpluginwrapper.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef PYTHONPLUGINWRAPPER_H -#define PYTHONPLUGINWRAPPER_H - -#include -#ifndef Q_MOC_RUN -#include -#endif - -class PythonPluginWrapper : public virtual MOBase::IPlugin -{ - -public: - PythonPluginWrapper(const boost::python::object &initFunction, - const boost::python::object &nameFunction, - const boost::python::object &authorFunction, - const boost::python::object &descriptionFunction, - const boost::python::object &versionFunction, - const boost::python::object &isActiveFunction, - const boost::python::object &settingsFunction); - - virtual bool init(MOBase::IOrganizer *moInfo); - virtual QString name() const; - virtual QString author() const; - virtual QString description() const; - virtual MOBase::VersionInfo version() const; - virtual bool isActive() const; - virtual QList settings() const; - -protected: - void reportPythonError() const; - -private: - - boost::python::object m_InitFunction; - boost::python::object m_NameFunction; - boost::python::object m_AuthorFunction; - boost::python::object m_DescriptionFunction; - boost::python::object m_VersionFunction; - boost::python::object m_IsActiveFunction; - boost::python::object m_SettingsFunction; - -}; - -#endif // PYTHONPLUGINWRAPPER_H diff --git a/src/proxy/pythontoolwrapper.cpp b/src/proxy/pythontoolwrapper.cpp deleted file mode 100644 index 8690dff..0000000 --- a/src/proxy/pythontoolwrapper.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include "pythontoolwrapper.h" -#include -#include - -using boost::python::extract; -using boost::python::handle_exception; - -PythonToolWrapper::PythonToolWrapper(const boost::python::object &initFunction, - const boost::python::object &nameFunction, - const boost::python::object &authorFunction, - const boost::python::object &descriptionFunction, - const boost::python::object &versionFunction, - const boost::python::object &isActiveFunction, - const boost::python::object &settingsFunction, - const boost::python::object &displayNameFunction, - const boost::python::object &tooltipFunction, - const boost::python::object &iconFunction, - const boost::python::object &displayFunction, - const boost::python::object &setParentWidget) - : PythonPluginWrapper(initFunction, nameFunction, authorFunction, descriptionFunction, - versionFunction, isActiveFunction, settingsFunction) - , m_DisplayNameFunction(displayNameFunction) - , m_ToolTipFunction(tooltipFunction) - , m_IconFunction(iconFunction) - , m_DisplayFunction(displayFunction) - , m_SetParentWidget(setParentWidget) -{ -} - - - -QString PythonToolWrapper::displayName() const -{ - try { - return boost::python::extract(m_DisplayNameFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QString(); - } -} - -QString PythonToolWrapper::tooltip() const -{ - try { - return boost::python::extract(m_ToolTipFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QString(); - } -} - -QIcon PythonToolWrapper::icon() const -{ - try { - std::vector rows; - boost::python::object l = m_IconFunction(); - if (!l.is_none()) { - for (int i = 0; i < boost::python::len(l); ++i) { - rows.push_back(extract(l[i])); - } - return QIcon(QPixmap(&rows[0])); - } else { - return QIcon(); - } - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QIcon(); - } -} - -void PythonToolWrapper::display() const -{ - try { - m_SetParentWidget(parentWidget()); - - m_DisplayFunction(); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - } -} diff --git a/src/proxy/pythontoolwrapper.h b/src/proxy/pythontoolwrapper.h deleted file mode 100644 index a5e2a45..0000000 --- a/src/proxy/pythontoolwrapper.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef PYTHONTOOLWRAPPER_H -#define PYTHONTOOLWRAPPER_H - - -#include -#ifndef Q_MOC_RUN -#include -#endif - -#include "pythonpluginwrapper.h" - - -class PythonToolWrapper : public QObject, public MOBase::IPluginTool, public PythonPluginWrapper -{ - - Q_OBJECT - Q_INTERFACES(MOBase::IPlugin MOBase::IPluginTool) - -public: - PythonToolWrapper(const boost::python::object &initFunction, - const boost::python::object &nameFunction, - const boost::python::object &authorFunction, - const boost::python::object &descriptionFunction, - const boost::python::object &versionFunction, - const boost::python::object &isActiveFunction, - const boost::python::object &settingsFunction, - const boost::python::object &displayNameFunction, - const boost::python::object &tooltipFunction, - const boost::python::object &iconFunction, - const boost::python::object &displayFunction, - const boost::python::object &setParentWidget); - - using PythonPluginWrapper::init; - using PythonPluginWrapper::name; - - virtual QString displayName() const; - virtual QString tooltip() const; - virtual QIcon icon() const; - -public slots: - - virtual void display() const; - -private: - - boost::python::object m_DisplayNameFunction; - boost::python::object m_ToolTipFunction; - boost::python::object m_IconFunction; - boost::python::object m_DisplayFunction; - - boost::python::object m_SetParentWidget; -}; - - - -#endif // PYTHONTOOLWRAPPER_H diff --git a/src/runner/pythonpluginwrapper.cpp b/src/runner/pythonpluginwrapper.cpp deleted file mode 100644 index 1c0677e..0000000 --- a/src/runner/pythonpluginwrapper.cpp +++ /dev/null @@ -1,111 +0,0 @@ -#include "pythonpluginwrapper.h" - - -using boost::python::extract; -using boost::python::handle_exception; - - -PythonPluginWrapper::PythonPluginWrapper(const boost::python::object &initFunction, - const boost::python::object &nameFunction, - const boost::python::object &authorFunction, - const boost::python::object &descriptionFunction, - const boost::python::object &versionFunction, - const boost::python::object &isActiveFunction, - const boost::python::object &settingsFunction) - : m_InitFunction(initFunction) - , m_NameFunction(nameFunction) - , m_AuthorFunction(authorFunction) - , m_DescriptionFunction(descriptionFunction) - , m_VersionFunction(versionFunction) - , m_IsActiveFunction(isActiveFunction) - , m_SettingsFunction(settingsFunction) -{ -} - - -void PythonPluginWrapper::reportPythonError() const -{ - if (PyErr_Occurred()) { - PyErr_Print(); - } else { - qCritical("An unexpected C++ exception was thrown in python code"); - } -} - - -bool PythonPluginWrapper::init(MOBase::IOrganizer *moInfo) -{ - try { - return boost::python::extract(m_InitFunction(boost::python::ptr(moInfo))); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return false; - } -} - -QString PythonPluginWrapper::name() const -{ - try { - return boost::python::extract(m_NameFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QString(); - } -} - -QString PythonPluginWrapper::author() const -{ - try { - return boost::python::extract(m_AuthorFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QString(); - } -} - -QString PythonPluginWrapper::description() const -{ - try { - return boost::python::extract(m_DescriptionFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QString(); - } -} - -MOBase::VersionInfo PythonPluginWrapper::version() const -{ - try { - return boost::python::extract(m_VersionFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return MOBase::VersionInfo(); - } -} - -bool PythonPluginWrapper::isActive() const -{ - try { - return boost::python::extract(m_IsActiveFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return false; - } -} - -QList PythonPluginWrapper::settings() const -{ - QList result; - try { - boost::python::object l = m_SettingsFunction(); - if (!l.is_none()) { - for (int i = 0; i < boost::python::len(l); ++i) { - result.append(extract(l[i])); - } - } - } catch (const boost::python::error_already_set&) { - reportPythonError(); - } - - return result; -} diff --git a/src/runner/pythonpluginwrapper.h b/src/runner/pythonpluginwrapper.h deleted file mode 100644 index f797d90..0000000 --- a/src/runner/pythonpluginwrapper.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef PYTHONPLUGINWRAPPER_H -#define PYTHONPLUGINWRAPPER_H - -#include -#ifndef Q_MOC_RUN -#include -#endif - -class PythonPluginWrapper : public virtual MOBase::IPlugin -{ - -public: - PythonPluginWrapper(const boost::python::object &initFunction, - const boost::python::object &nameFunction, - const boost::python::object &authorFunction, - const boost::python::object &descriptionFunction, - const boost::python::object &versionFunction, - const boost::python::object &isActiveFunction, - const boost::python::object &settingsFunction); - - virtual bool init(MOBase::IOrganizer *moInfo); - virtual QString name() const; - virtual QString author() const; - virtual QString description() const; - virtual MOBase::VersionInfo version() const; - virtual bool isActive() const; - virtual QList settings() const; - -protected: - - void reportPythonError() const; - -private: - - boost::python::object m_InitFunction; - boost::python::object m_NameFunction; - boost::python::object m_AuthorFunction; - boost::python::object m_DescriptionFunction; - boost::python::object m_VersionFunction; - boost::python::object m_IsActiveFunction; - boost::python::object m_SettingsFunction; - -}; - -#endif // PYTHONPLUGINWRAPPER_H diff --git a/src/runner/pythontoolwrapper.cpp b/src/runner/pythontoolwrapper.cpp deleted file mode 100644 index 8690dff..0000000 --- a/src/runner/pythontoolwrapper.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include "pythontoolwrapper.h" -#include -#include - -using boost::python::extract; -using boost::python::handle_exception; - -PythonToolWrapper::PythonToolWrapper(const boost::python::object &initFunction, - const boost::python::object &nameFunction, - const boost::python::object &authorFunction, - const boost::python::object &descriptionFunction, - const boost::python::object &versionFunction, - const boost::python::object &isActiveFunction, - const boost::python::object &settingsFunction, - const boost::python::object &displayNameFunction, - const boost::python::object &tooltipFunction, - const boost::python::object &iconFunction, - const boost::python::object &displayFunction, - const boost::python::object &setParentWidget) - : PythonPluginWrapper(initFunction, nameFunction, authorFunction, descriptionFunction, - versionFunction, isActiveFunction, settingsFunction) - , m_DisplayNameFunction(displayNameFunction) - , m_ToolTipFunction(tooltipFunction) - , m_IconFunction(iconFunction) - , m_DisplayFunction(displayFunction) - , m_SetParentWidget(setParentWidget) -{ -} - - - -QString PythonToolWrapper::displayName() const -{ - try { - return boost::python::extract(m_DisplayNameFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QString(); - } -} - -QString PythonToolWrapper::tooltip() const -{ - try { - return boost::python::extract(m_ToolTipFunction()); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QString(); - } -} - -QIcon PythonToolWrapper::icon() const -{ - try { - std::vector rows; - boost::python::object l = m_IconFunction(); - if (!l.is_none()) { - for (int i = 0; i < boost::python::len(l); ++i) { - rows.push_back(extract(l[i])); - } - return QIcon(QPixmap(&rows[0])); - } else { - return QIcon(); - } - } catch (const boost::python::error_already_set&) { - reportPythonError(); - return QIcon(); - } -} - -void PythonToolWrapper::display() const -{ - try { - m_SetParentWidget(parentWidget()); - - m_DisplayFunction(); - } catch (const boost::python::error_already_set&) { - reportPythonError(); - } -} diff --git a/src/runner/pythontoolwrapper.h b/src/runner/pythontoolwrapper.h deleted file mode 100644 index 0e07c13..0000000 --- a/src/runner/pythontoolwrapper.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef PYTHONTOOLWRAPPER_H -#define PYTHONTOOLWRAPPER_H - -#include -#ifndef Q_MOC_RUN -#include -#endif - -#include "pythonpluginwrapper.h" - - -class PythonToolWrapper : public MOBase::IPluginTool, public PythonPluginWrapper -{ - - Q_OBJECT - Q_INTERFACES(MOBase::IPlugin MOBase::IPluginTool) - -public: - PythonToolWrapper(const boost::python::object &initFunction, - const boost::python::object &nameFunction, - const boost::python::object &authorFunction, - const boost::python::object &descriptionFunction, - const boost::python::object &versionFunction, - const boost::python::object &isActiveFunction, - const boost::python::object &settingsFunction, - const boost::python::object &displayNameFunction, - const boost::python::object &tooltipFunction, - const boost::python::object &iconFunction, - const boost::python::object &displayFunction, - const boost::python::object &setParentWidget); - - using PythonPluginWrapper::init; - using PythonPluginWrapper::name; - - virtual QString displayName() const; - virtual QString tooltip() const; - virtual QIcon icon() const; - -public slots: - - virtual void display() const; - -private: - - boost::python::object m_DisplayNameFunction; - boost::python::object m_ToolTipFunction; - boost::python::object m_IconFunction; - boost::python::object m_DisplayFunction; - - boost::python::object m_SetParentWidget; -}; - - - -#endif // PYTHONTOOLWRAPPER_H From d8ad6569baabdcda45080cbbbbfdc57fe6f2b482 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 11 Apr 2018 17:27:23 +0100 Subject: [PATCH 3/3] remove dead include --- src/runner/pythonrunner.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 2e901c0..3c752ea 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -9,7 +9,6 @@ #include #include #include "uibasewrappers.h" -#include "pythonpluginwrapper.h" #include "proxypluginwrappers.h" #include