Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 08:14:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixing tests, moving some plugin container stuff to base class

Browse source
This commit is contained in:
Brad Davis 2015-12-03 17:07:04 -08:00
parent 60aa93c38c
commit c4514743d1
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/PluginContainerProxy.cpp
View file

@ -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;
}

4
interface/src/PluginContainerProxy.h
View file

@ -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;

15
libraries/plugins/src/plugins/PluginContainer.h
View file

@ -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;
};

2
tests/controllers/src/main.cpp
View file

@ -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 {}