Web Browser window: remove our support for Python.

Indeed, there is, at this stage at least, no need for accessing our Web Browser window from Python.
opencor · Nov 19, 2019 · 48f052e · 48f052e
1 parent 82bceea
commit 48f052e
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 200 deletions.
diff --git 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
@@ -21,11 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // 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<WebBrowserWindowPlugin *>(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
@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "i18ninterface.h"
 #include "plugininfo.h"
 #include "plugininterface.h"
-#include "pythoninterface.h"
 #include "windowinterface.h"
 
 //==============================================================================
@@ -42,38 +41,29 @@ 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
 
     Q_PLUGIN_METADATA(IID "OpenCOR.WebBrowserWindowPlugin" FILE "webbrowserwindowplugin.json")
 
     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
diff --git a/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowpythonwrapper.h b/src/plugins/miscellaneous/WebBrowserWindow/src/webbrowserwindowpythonwrapper.h
diff --git 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
@@ -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;