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

removed override keyword from OtherAvatar and MyAvatar destructors, also

Browse source 
added the virtual keyword to the createOrb virtual method in OtherAvatar
This commit is contained in:
amantley 2018-06-27 14:31:33 -07:00
parent 99ff5f9140
commit 205cd44a49
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/MyAvatar.h
View file

@ -250,7 +250,7 @@ public:
Q_ENUM(DriveKeys) Q_ENUM(DriveKeys)
explicit MyAvatar(QThread* thread); explicit MyAvatar(QThread* thread);
~MyAvatar() override; virtual ~MyAvatar();
void instantiableAvatar() override {}; void instantiableAvatar() override {};
void registerMetaTypes(ScriptEnginePointer engine); void registerMetaTypes(ScriptEnginePointer engine);

4
interface/src/avatar/OtherAvatar.h
View file

@ -17,10 +17,10 @@
class OtherAvatar : public Avatar { class OtherAvatar : public Avatar {
public: public:
explicit OtherAvatar(QThread* thread); explicit OtherAvatar(QThread* thread);
~OtherAvatar() override; virtual ~OtherAvatar();
virtual void instantiableAvatar() override { }; virtual void instantiableAvatar() override { };
void createOrb() override; virtual void createOrb() override;
void updateOrbPosition(); void updateOrbPosition();
void removeOrb(); void removeOrb();