Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 23:44:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Merge pull request from Atlante45/fix/osx-warnings

Browse source 
Fix OSX warnings
This commit is contained in:
Brad Hefta-Gaub 2016-05-20 07:31:35 -07:00
commit 313708ab5f
2 changed files with 3 additions and 3 deletions
assignment-client/src/entities
EntityServer.h
tests/controllers/src
main.cpp

4
assignment-client/src/entities/EntityServer.h
View file

@ -60,8 +60,8 @@ public:
virtual void trackViewerGone(const QUuid& sessionID) override;
public slots:
virtual void nodeAdded(SharedNodePointer node);
virtual void nodeKilled(SharedNodePointer node);
virtual void nodeAdded(SharedNodePointer node) override;
virtual void nodeKilled(SharedNodePointer node) override;
void pruneDeletedEntities();
protected:

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

@ -89,7 +89,7 @@ public:
virtual GLWidget* getPrimaryWidget() override { return nullptr; }
virtual MainWindow* getPrimaryWindow() override { return nullptr; }
virtual QOpenGLContext* getPrimaryContext() override { return nullptr; }
virtual ui::Menu* getPrimaryMenu() { return nullptr; }
virtual ui::Menu* getPrimaryMenu() override { return nullptr; }
virtual bool isForeground() override { return true; }
virtual const DisplayPluginPointer getActiveDisplayPlugin() const override { return DisplayPluginPointer(); }
};