diff --git a/src/plugins/miscellaneous/WebBrowserWindow/CMakeLists.txt b/src/plugins/miscellaneous/WebBrowserWindow/CMakeLists.txt
index a66000fc71..f70bc20be1 100644
--- a/src/plugins/miscellaneous/WebBrowserWindow/CMakeLists.txt
+++ b/src/plugins/miscellaneous/WebBrowserWindow/CMakeLists.txt
@@ -7,18 +7,15 @@ add_plugin(WebBrowserWindow
../../i18ninterface.cpp
../../plugininfo.cpp
../../plugininterface.cpp
- ../../pythoninterface.cpp
../../windowinterface.cpp
src/webbrowserwindowplugin.cpp
- src/webbrowserwindowpythonwrapper.cpp
src/webbrowserwindowwidget.cpp
src/webbrowserwindowwindow.cpp
UIS
src/webbrowserwindowwindow.ui
PLUGINS
Core
- PythonQtSupport
WebViewerWidget
QT_MODULES
PrintSupport
diff --git a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.cpp b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.cpp
index 1b8dc1455b..988c51c072 100644
--- a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.cpp
+++ b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.cpp
@@ -21,11 +21,9 @@ along with this program. If not, see .
// Web Browser window plugin
//==============================================================================
-#include "corecliutils.h"
#include "coreguiutils.h"
#include "webbrowserwindowplugin.h"
#include "webbrowserwindowwindow.h"
-#include "webbrowserwindowpythonwrapper.h"
//==============================================================================
@@ -47,7 +45,7 @@ PLUGININFO_FUNC WebBrowserWindowPluginInfo()
descriptions.insert("fr", QString::fromUtf8("une extension pour naviguer sur le Web."));
return new PluginInfo(PluginInfo::Category::Miscellaneous, true, false,
- QStringList() << "Core" << "PythonQtSupport" << "WebViewerWidget",
+ QStringList() << "Core" << "WebViewerWidget",
#if !defined(QT_DEBUG) || !defined(Q_OS_WIN)
descriptions,
QStringList() << "PythonConsoleWindow");
@@ -108,12 +106,6 @@ void WebBrowserWindowPlugin::initializePlugin()
// Create our Web Browser window
mWebBrowserWindowWindow = new WebBrowserWindowWindow(Core::mainWindow());
-
- // Get the Web Browser window's widget and save it for our Python wrapper
-
- mWebBrowserWindowWidget = mWebBrowserWindowWindow->widget();
-
- instance()->mWebBrowserWindowWidget = mWebBrowserWindowWidget;
}
//==============================================================================
@@ -163,17 +155,6 @@ void WebBrowserWindowPlugin::handleUrl(const QUrl &pUrl)
// We don't handle this interface...
}
-//==============================================================================
-// Python interface
-//==============================================================================
-
-void WebBrowserWindowPlugin::registerPythonClasses(PyObject *pModule)
-{
- // Register our Python classes
-
- new WebBrowserWindowPythonWrapper(pModule, this);
-}
-
//==============================================================================
// Window interface
//==============================================================================
@@ -203,30 +184,6 @@ QDockWidget * WebBrowserWindowPlugin::windowWidget() const
return mWebBrowserWindowWindow;
}
-//==============================================================================
-// Plugin specific
-//==============================================================================
-
-WebBrowserWindowPlugin * WebBrowserWindowPlugin::instance()
-{
- // Return the 'global' instance of our plugin
-
- static WebBrowserWindowPlugin instance;
-
- return static_cast(Core::globalInstance("OpenCOR::WebBrowserWindow::WebBrowserWindowPlugin::instance()",
- &instance));
-}
-
-
-//==============================================================================
-
-WebBrowserWindowWidget * WebBrowserWindowPlugin::webBrowserWindowWidget() const
-{
- // Return our Web Browser window widget
-
- return mWebBrowserWindowWidget;
-}
-
//==============================================================================
} // namespace WebBrowserWindow
diff --git a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.h b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.h
index 8ebb9374b0..1075f2bccb 100644
--- a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.h
+++ b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowplugin.h
@@ -28,7 +28,6 @@ along with this program. If not, see .
#include "i18ninterface.h"
#include "plugininfo.h"
#include "plugininterface.h"
-#include "pythoninterface.h"
#include "windowinterface.h"
//==============================================================================
@@ -42,14 +41,12 @@ PLUGININFO_FUNC WebBrowserWindowPluginInfo();
//==============================================================================
-class WebBrowserWindowWidget;
class WebBrowserWindowWindow;
//==============================================================================
class WebBrowserWindowPlugin : public QObject, public I18nInterface,
- public PluginInterface, public PythonInterface,
- public WindowInterface
+ public PluginInterface, public WindowInterface
{
Q_OBJECT
@@ -57,23 +54,16 @@ class WebBrowserWindowPlugin : public QObject, public I18nInterface,
Q_INTERFACES(OpenCOR::I18nInterface)
Q_INTERFACES(OpenCOR::PluginInterface)
- Q_INTERFACES(OpenCOR::PythonInterface)
Q_INTERFACES(OpenCOR::WindowInterface)
public:
#include "i18ninterface.inl"
#include "plugininterface.inl"
-#include "pythoninterface.inl"
#include "windowinterface.inl"
- static WebBrowserWindowPlugin * instance();
-
- WebBrowserWindowWidget * webBrowserWindowWidget() const;
-
private:
QAction *mWebBrowserWindowAction = nullptr;
- WebBrowserWindowWidget *mWebBrowserWindowWidget = nullptr;
WebBrowserWindowWindow *mWebBrowserWindowWindow = nullptr;
};
diff --git a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowpythonwrapper.cpp b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowpythonwrapper.cpp
deleted file mode 100644
index d2d97b856b..0000000000
--- a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowpythonwrapper.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
-
-Copyright (C) The University of Auckland
-
-OpenCOR is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-OpenCOR is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-*******************************************************************************/
-
-//==============================================================================
-// Web Browser window Python wrapper
-//==============================================================================
-
-#include "pythonqtsupport.h"
-#include "webbrowserwindowplugin.h"
-#include "webbrowserwindowpythonwrapper.h"
-#include "webbrowserwindowwidget.h"
-
-//==============================================================================
-
-#include
-
-//==============================================================================
-
-#include
-
-//==============================================================================
-
-namespace OpenCOR {
-namespace WebBrowserWindow {
-
-//==============================================================================
-
-static PyObject * webBrowserWindowWebView(PyObject *pSelf, PyObject *pArgs)
-{
- Q_UNUSED(pSelf)
- Q_UNUSED(pArgs)
-
- // Return a Python object to our Web browser window's Web view
-
- return PythonQtSupport::wrapQObject(WebBrowserWindowPlugin::instance()->webBrowserWindowWidget()->webView());
-}
-//==============================================================================
-
-WebBrowserWindowPythonWrapper::WebBrowserWindowPythonWrapper(PyObject *pModule,
- QObject *pParent) :
- QObject(pParent)
-{
- // Add some Python wrappers
-
- static std::array PythonWebBrowserWindowMethods = {{
- { "webBrowserWindowWebView", webBrowserWindowWebView, METH_VARARGS, "Return OpenCOR's Web Browser window's QWebView object." },
- { nullptr, nullptr, 0, nullptr }
- }};
-
- PyModule_AddFunctions(pModule, PythonWebBrowserWindowMethods.data());
-}
-
-//==============================================================================
-} // namespace WebBrowserWindow
-} // namespace OpenCOR
-
-//==============================================================================
-// End of file
-//==============================================================================
diff --git a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowpythonwrapper.h b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowpythonwrapper.h
deleted file mode 100644
index 5cce2641ae..0000000000
--- a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowpythonwrapper.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
-
-Copyright (C) The University of Auckland
-
-OpenCOR is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-OpenCOR is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-*******************************************************************************/
-
-//==============================================================================
-// Web Browser window Python wrapper
-//==============================================================================
-
-#pragma once
-
-//==============================================================================
-
-#include
-
-//==============================================================================
-
-#include "pythonbegin.h"
- #include "PythonQt/PythonQtPythonInclude.h"
-#include "pythonend.h"
-
-//==============================================================================
-
-namespace OpenCOR {
-namespace WebBrowserWindow {
-
-//==============================================================================
-
-class WebBrowserWindowPythonWrapper : public QObject
-{
- Q_OBJECT
-
-public:
- explicit WebBrowserWindowPythonWrapper(PyObject *pModule, QObject *pParent);
-};
-
-//==============================================================================
-
-} // namespace WebBrowserWindow
-} // namespace OpenCOR
-
-//==============================================================================
-// End of file
-//==============================================================================
diff --git a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowwindow.cpp b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowwindow.cpp
index c9e0751e4b..a2bb4c3dd2 100644
--- a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowwindow.cpp
+++ b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowwindow.cpp
@@ -261,13 +261,6 @@ void WebBrowserWindowWindow::saveSettings(QSettings &pSettings) const
//==============================================================================
-WebBrowserWindowWidget * WebBrowserWindowWindow::widget() const
-{
- return mWebBrowserWindowWidget;
-}
-
-//==============================================================================
-
void WebBrowserWindowWindow::urlChanged(const QUrl &pUrl)
{
// The URL has changed, so update our URL value
diff --git a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowwindow.h b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowwindow.h
index 5145cdc347..720baa6298 100644
--- a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowwindow.h
+++ b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowwindow.h
@@ -62,8 +62,6 @@ class WebBrowserWindowWindow : public Core::WindowWidget
void loadSettings(QSettings &pSettings) override;
void saveSettings(QSettings &pSettings) const override;
- WebBrowserWindowWidget * widget() const;
-
private:
Ui::WebBrowserWindowWindow *mGui;