diff --git a/interface/src/PluginContainerProxy.cpp b/interface/src/PluginContainerProxy.cpp index abb52380d0..aff36fb881 100644 --- a/interface/src/PluginContainerProxy.cpp +++ b/interface/src/PluginContainerProxy.cpp @@ -185,10 +185,3 @@ void PluginContainerProxy::releaseOverlayTexture(uint32_t texture) { // FIXME implement present thread compositing } -QVector<QPair<QString, QString>>& PluginContainerProxy::currentDisplayActions() { - return _currentDisplayPluginActions; -} - -QVector<QPair<QString, QString>>& PluginContainerProxy::currentInputActions() { - return _currentInputPluginActions; -} diff --git a/interface/src/PluginContainerProxy.h b/interface/src/PluginContainerProxy.h index cd15510885..5d974f0a0c 100644 --- a/interface/src/PluginContainerProxy.h +++ b/interface/src/PluginContainerProxy.h @@ -14,8 +14,6 @@ class PluginContainerProxy : public QObject, PluginContainer { Q_OBJECT PluginContainerProxy(); virtual ~PluginContainerProxy(); - virtual QVector<QPair<QString, QString>>& currentDisplayActions() override; - virtual QVector<QPair<QString, QString>>& currentInputActions() override; virtual void addMenu(const QString& menuName) override; virtual void removeMenu(const QString& menuName) override; virtual QAction* addMenuItem(PluginType type, const QString& path, const QString& name, std::function<void(bool)> onClicked, bool checkable = false, bool checked = false, const QString& groupName = "") override; @@ -37,8 +35,6 @@ class PluginContainerProxy : public QObject, PluginContainer { QRect _savedGeometry{ 10, 120, 800, 600 }; std::map<QString, QActionGroup*> _exclusiveGroups; - QVector<QPair<QString, QString>> _currentDisplayPluginActions; - QVector<QPair<QString, QString>> _currentInputPluginActions; friend class Application; diff --git a/libraries/plugins/src/plugins/PluginContainer.h b/libraries/plugins/src/plugins/PluginContainer.h index 337ffd3c57..6732bc02ba 100644 --- a/libraries/plugins/src/plugins/PluginContainer.h +++ b/libraries/plugins/src/plugins/PluginContainer.h @@ -28,8 +28,6 @@ public: static PluginContainer& getInstance(); PluginContainer(); virtual ~PluginContainer(); - virtual QVector<QPair<QString, QString>>& currentDisplayActions() = 0; - virtual QVector<QPair<QString, QString>>& currentInputActions() = 0; virtual void addMenu(const QString& menuName) = 0; virtual void removeMenu(const QString& menuName) = 0; virtual QAction* addMenuItem(PluginType pluginType, const QString& path, const QString& name, std::function<void(bool)> onClicked, bool checkable = false, bool checked = false, const QString& groupName = "") = 0; @@ -48,4 +46,17 @@ public: virtual QOpenGLContext* getPrimaryContext() = 0; virtual bool isForeground() = 0; virtual const DisplayPlugin* getActiveDisplayPlugin() const = 0; + + QVector<QPair<QString, QString>>& currentDisplayActions() { + return _currentDisplayPluginActions; + } + + QVector<QPair<QString, QString>>& currentInputActions() { + return _currentInputPluginActions; + } + +protected: + QVector<QPair<QString, QString>> _currentDisplayPluginActions; + QVector<QPair<QString, QString>> _currentInputPluginActions; + }; diff --git a/tests/controllers/src/main.cpp b/tests/controllers/src/main.cpp index c5c038fde3..8514d33d2e 100644 --- a/tests/controllers/src/main.cpp +++ b/tests/controllers/src/main.cpp @@ -83,7 +83,7 @@ public: virtual ~PluginContainerProxy() {} virtual void addMenu(const QString& menuName) override {} virtual void removeMenu(const QString& menuName) override {} - virtual QAction* addMenuItem(const QString& path, const QString& name, std::function<void(bool)> onClicked, bool checkable = false, bool checked = false, const QString& groupName = "") override { return nullptr; } + virtual QAction* addMenuItem(PluginType type, const QString& path, const QString& name, std::function<void(bool)> onClicked, bool checkable = false, bool checked = false, const QString& groupName = "") override { return nullptr; } virtual void removeMenuItem(const QString& menuName, const QString& menuItem) override {} virtual bool isOptionChecked(const QString& name) override { return false; } virtual void setIsOptionChecked(const QString& path, bool checked) override {}